git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] history: streamline message preparation and plug file stream leak

From
Patrick Steinhardt <ps@pks.im>
Date
Jun 29, 2026, 16:04 UTC
Message-ID
<akKXfQFw3RwkshG9@pks.im>
In-Reply-To
<xmqq33y5z82l.fsf@gitster.g>
On Mon, Jun 29, 2026 at 08:21:06AM -0700, Junio C Hamano wrote:
Show 29 quoted lines
> Patrick Steinhardt <ps@pks.im> writes:
> 
> >> +	strbuf_addstr(out, default_message);
> >> +	strbuf_addch(out, '\n');
> >> +	strbuf_commented_addf(out, comment_line_str, hint, action, comment_line_str);
> >> +	fwrite(out->buf, 1, out->len, s.fp);
> >>  
> >>  	wt_status_collect_changes_trees(&s, old_tree, new_tree);
> >>  	wt_status_print(&s);
> >>  	wt_status_collect_free_buffers(&s);
> >>  	string_list_clear_func(&s.change, change_data_free);
> >> +	fclose(s.fp);
> >
> > This is fixing the leaked file descriptor.
> >
> > One thing I wonder though is that we don't perform any error checking on
> > the file in the new version. Previously, we would have died in case
> > `write_file_buf()` failed. But now we just `fwrite()` without error
> > checking. I don't think that "wt-status.c" does error checking either,
> > so we might end up with a partially-written file without us noticing.
> 
> Yes, the fwrite() should be protected with an error checking and
> die() the same way as the code before.  Will send a v2.
> 
> But isn't the end result the same between preimage and postimage?
> If the stuff appended by wt_status_* are still written without error
> checking, we would leave a partially-written file that has the
> default_messages and the commented hint/action but not necessarily
> whatever we wanted to add with wt_status().

At least it would only be the status information that's missing in that case, the commit message itself would be retained (or we'd die if it wasn't written). So we didn't have the potential to loose information that is intended to end up in the final commit.

Patrick
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 6 in “history: streamline message preparation and plug file stream leak”
  1. history: streamline message preparation and plug file stream leakJunio C Hamano, Jun 26, 2026
  2. Patrick SteinhardtJun 29, 2026
  3. Junio C HamanoJun 29, 2026
  4. Patrick SteinhardtJun 29, 2026
  5. history: streamline message preparation and plug file stream leakJunio C Hamano, Jun 29, 2026
  6. Patrick SteinhardtJun 30, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.