pack-bitmap-write: fix leaking OID array

Fix a leaking OID array in `write_pseudo_merges()`.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 6413dd1731eb728fe78b410af4bf8007ae412fdb..49758e2525f01afc4c31a97a8128e5d92f7f7939 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -913,6 +913,7 @@ static void write_pseudo_merges(struct bitmap_writer *writer,
        for (i = 0; i < writer->pseudo_merges_nr; i++)
                bitmap_free(commits_bitmap[i]);
 
+       oid_array_clear(&commits);
        free(pseudo_merge_ofs);
        free(commits_bitmap);
 }

diff --git a/t/t5333-pseudo-merge-bitmaps.sh b/t/t5333-pseudo-merge-bitmaps.sh
index 1dd62847560dc02815e0bd1964bfb68c47ff40b1..eca4a1eb8c6e56a935bb336a9cdb3272d216d4ca 100755 (executable)
--- a/t/t5333-pseudo-merge-bitmaps.sh
+++ b/t/t5333-pseudo-merge-bitmaps.sh
@@ -4,6 +4,7 @@ test_description='pseudo-merge bitmaps'
 
 GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_pseudo_merges () {