]> git.ipfire.org Git - thirdparty/git.git/commitdiff
cat-file: fix a memory leak in --batch-command mode
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Fri, 1 Jul 2022 10:42:54 +0000 (12:42 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jul 2022 18:43:43 +0000 (11:43 -0700)
Fix a memory leak introduced in 440c705ea63 (cat-file: add
--batch-command mode, 2022-02-18). The free_cmds() function was only
called on "queued_nr" if we had a "flush" command. As the "without
flush for blob info" test added in the same commit shows we can't rely
on that, so let's call free_cmds() again at the end.

Since "nr" follows the usual pattern of being set to 0 if we've
free()'d the memory already it's OK to call it twice, even in cases
where we are doing a "flush".

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/cat-file.c

index 50cf38999d10125428e4c558383582af4f191b95..ac0459f96be8441c8e30e092ff2180933baa497a 100644 (file)
@@ -655,6 +655,7 @@ static void batch_objects_command(struct batch_options *opt,
                free_cmds(queued_cmd, &nr);
        }
 
+       free_cmds(queued_cmd, &nr);
        free(queued_cmd);
        strbuf_release(&input);
 }