]> git.ipfire.org Git - thirdparty/git.git/commitdiff
builtin/repack.c: avoid leaking child arguments
authorTaylor Blau <me@ttaylorr.com>
Thu, 28 Oct 2021 20:25:48 +0000 (16:25 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Oct 2021 22:31:51 +0000 (15:31 -0700)
`git repack` invokes a handful of child processes: one to write the
actual pack, and optionally ones to repack promisor objects and update
the MIDX.

Most of these are freed automatically by calling `start_command()` (which
invokes it on error) and `finish_command()` which calls it
automatically.

But repack_promisor_objects() can initialize a child_process, populate
its array of arguments, and then return from the function before even
calling start_command().

Make sure that the prepared list of arguments is freed by calling
child_process_clear() ourselves to avoid leaking memory along this path.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/repack.c

index 0b2d1e5d82bedb38570ab056f029bdd3c24e1c5f..9b74e0d46868d23472bf4181d17ce2030293b86c 100644 (file)
@@ -258,9 +258,11 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
        for_each_packed_object(write_oid, &cmd,
                               FOR_EACH_OBJECT_PROMISOR_ONLY);
 
-       if (cmd.in == -1)
+       if (cmd.in == -1) {
                /* No packed objects; cmd was never started */
+               child_process_clear(&cmd);
                return;
+       }
 
        close(cmd.in);