From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] history: streamline message preparation and plug file stream leak
Date: Mon, 29 Jun 2026 08:21:06 -0700 [thread overview]
Message-ID: <xmqq33y5z82l.fsf@gitster.g> (raw)
In-Reply-To: <akIRrmD4Tqp-Gi9d@pks.im> (Patrick Steinhardt's message of "Mon, 29 Jun 2026 08:33:18 +0200")
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().
next prev parent reply other threads:[~2026-06-29 15:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-26 16:38 [PATCH] history: streamline message preparation and plug file stream leak Junio C Hamano
2026-06-29 6:33 ` Patrick Steinhardt
2026-06-29 15:21 ` Junio C Hamano [this message]
2026-06-29 16:04 ` Patrick Steinhardt
2026-06-29 16:08 ` [PATCH v2] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq33y5z82l.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox