From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH] sparse-checkout: use fdopen_lock_file() instead of xfdopen()
Date: Thu, 05 Sep 2024 14:16:45 -0700 [thread overview]
Message-ID: <xmqqr09xztqa.fsf@gitster.g> (raw)
In-Reply-To: <ZtmN6sZCvDy1BGfn@pks.im> (Patrick Steinhardt's message of "Thu, 5 Sep 2024 12:54:42 +0200")
Patrick Steinhardt <ps@pks.im> writes:
>> + if (commit_lock_file(&lk))
>> + die_errno(_("unable to write %s"), get_locked_file_path(&lk));
>>
>> clear_pattern_list(pl);
>
> I think the error handling is broken. `commit_lock_file()` calls
> `rename_tempfile()`, which deletes the temporary file even in the error
> case. The consequence is that `lk->tempfile` will be set to the `NULL`
> pointer. When we call `get_locked_file_path()` we then dereference it
> unconditionally and would thus segfault.
Hmph. Would this be sufficient as a band-aid, then?
builtin/sparse-checkout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git c/builtin/sparse-checkout.c w/builtin/sparse-checkout.c
index f1bd31b2f7..60363fd056 100644
--- c/builtin/sparse-checkout.c
+++ w/builtin/sparse-checkout.c
@@ -356,7 +356,7 @@ static int write_patterns_and_update(struct pattern_list *pl)
write_patterns_to_file(fp, pl);
if (commit_lock_file(&lk))
- die_errno(_("unable to write %s"), get_locked_file_path(&lk));
+ die_errno(_("unable to write %s"), sparse_filename);
clear_pattern_list(pl);
next prev parent reply other threads:[~2024-09-05 21:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-05 8:27 [PATCH] sparse-checkout: use fdopen_lock_file() instead of xfdopen() Jeff King
2024-09-05 10:54 ` Patrick Steinhardt
2024-09-05 21:16 ` Junio C Hamano [this message]
2024-09-05 21:20 ` Junio C Hamano
2024-09-06 1:19 ` Jeff King
2024-09-06 14:55 ` Junio C Hamano
2024-09-05 15:16 ` Junio C Hamano
2024-09-06 3:45 ` [PATCH v2 0/3] sparse-checkout file handle leak fix Jeff King
2024-09-06 3:47 ` [PATCH v2 1/3] sparse-checkout: consolidate cleanup when writing patterns Jeff King
2024-09-06 3:47 ` [PATCH v2 2/3] sparse-checkout: check commit_lock_file " Jeff King
2024-09-06 3:48 ` [PATCH v2 3/3] sparse-checkout: use fdopen_lock_file() instead of xfdopen() Jeff King
2024-09-06 9:25 ` [PATCH v2 0/3] sparse-checkout file handle leak fix Patrick Steinhardt
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=xmqqr09xztqa.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--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;
as well as URLs for NNTP newsgroup(s).