diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-07-01 12:42:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-01 11:43:43 -0700 |
| commit | d90dafbe3180aa0ad095a5f2fa9c83bfa3d3767d (patch) | |
| tree | 0c0be25af1ce54c981a022761185f263b2ee678b /builtin | |
| parent | fd74ac95ac31cefee41cb732255c25d910008fff (diff) | |
| download | git-d90dafbe3180aa0ad095a5f2fa9c83bfa3d3767d.tar.gz | |
cat-file: fix a memory leak in --batch-command mode
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/cat-file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 50cf38999d..ac0459f96b 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -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); } |