From: Junio C Hamano <gitster@pobox.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org, avarab@gmail.com, dstolee@microsoft.com,
peff@peff.net
Subject: Re: [PATCH v2 5/9] builtin/repack.c: avoid leaking child arguments
Date: Wed, 27 Oct 2021 16:44:48 -0700 [thread overview]
Message-ID: <xmqqzgqut4lr.fsf@gitster.g> (raw)
In-Reply-To: <bcd12ecab81029be825a646348cb7ae69970a819.1635282024.git.me@ttaylorr.com> (Taylor Blau's message of "Tue, 26 Oct 2021 17:01:16 -0400")
Taylor Blau <me@ttaylorr.com> writes:
> @@ -586,8 +588,10 @@ static int write_midx_included_packs(struct string_list *include,
> strvec_pushf(&cmd.args, "--refs-snapshot=%s", refs_snapshot);
>
> ret = start_command(&cmd);
> - if (ret)
> + if (ret) {
> + child_process_clear(&cmd);
> return ret;
> + }
This happens only when start_command() returns an error. But the
function always calls child_process_clear() before doing so.
So I am not sure if this hunk is needed. It didn't exist in v1, if
I recall correctly. Am I missing something obvious?
> @@ -608,9 +612,10 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
> struct pack_geometry *geometry = NULL;
> struct strbuf line = STRBUF_INIT;
> struct tempfile *refs_snapshot = NULL;
> - int i, ext, ret;
> + int i, ext, ret = 0;
> FILE *out;
> int show_progress = isatty(2);
> + int cmd_cleared = 0;
>
> /* variables to be filled by option parsing */
> int pack_everything = 0;
> @@ -794,7 +799,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
>
> ret = start_command(&cmd);
> if (ret)
> - return ret;
> + goto cleanup;
Likewise, at this point, start_command() should have already cleared
cmd before it returned an error, no?
> @@ -818,8 +823,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
> }
> fclose(out);
> ret = finish_command(&cmd);
> + cmd_cleared = 1;
> if (ret)
> - return ret;
> + goto cleanup;
And cmd is also cleared after we pass this point. So perhaps after
the cleanup label, there is no need to call child_process_clear() at
all, no?
next prev parent reply other threads:[~2021-10-27 23:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 21:01 [PATCH v2 0/9] midx: clean up t5319 under 'SANITIZE=leak' Taylor Blau
2021-10-26 21:01 ` [PATCH v2 1/9] midx.c: clean up chunkfile after reading the MIDX Taylor Blau
2021-10-26 21:01 ` [PATCH v2 2/9] midx.c: don't leak MIDX from verify_midx_file Taylor Blau
2021-10-26 21:01 ` [PATCH v2 3/9] t/helper/test-read-midx.c: free MIDX within read_midx_file() Taylor Blau
2021-10-26 21:01 ` [PATCH v2 4/9] builtin/pack-objects.c: don't leak memory via arguments Taylor Blau
2021-10-26 21:01 ` [PATCH v2 5/9] builtin/repack.c: avoid leaking child arguments Taylor Blau
2021-10-27 23:44 ` Junio C Hamano [this message]
2021-10-28 20:25 ` Taylor Blau
2021-10-26 21:01 ` [PATCH v2 6/9] builtin/multi-pack-index.c: don't leak concatenated options Taylor Blau
2021-10-26 21:01 ` [PATCH v2 7/9] midx.c: write MIDX filenames to strbuf Taylor Blau
2021-10-26 21:01 ` [PATCH v2 8/9] pack-bitmap.c: don't leak type-level bitmaps Taylor Blau
2021-10-26 21:01 ` [PATCH v2 9/9] pack-bitmap.c: more aggressively free in free_bitmap_index() Taylor Blau
2021-10-27 23:49 ` [PATCH v2 0/9] midx: clean up t5319 under 'SANITIZE=leak' 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=xmqqzgqut4lr.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/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).