pack-bitmap-write: fix leaking OID array

pks-t · gitster · commit 7f97266ee15d · 2024-09-30T11:23:07.000-07:00
Fix a leaking OID array in `write_pseudo_merges()`.

Signed-off-by: Patrick Steinhardt &lt;ps@pks.im&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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 () {

Original file line number	Diff line number	Diff line change
`@@ -913,6 +913,7 @@ static void write_pseudo_merges(struct bitmap_writer *writer,`
`913`	`913`	`for (i = 0; i < writer->pseudo_merges_nr; i++)`
`914`	`914`	`bitmap_free(commits_bitmap[i]);`
`915`	`915`
	`916`	`+ oid_array_clear(&commits);`
`916`	`917`	`free(pseudo_merge_ofs);`
`917`	`918`	`free(commits_bitmap);`
`918`	`919`	`}`