Merge branch 'ly/commit-graph-fill-oids-leakfix'

gitster · gitster · commit b6fa7fbcd1b6 · 2025-05-27T13:59:08.000-07:00
Leakfix.

* ly/commit-graph-fill-oids-leakfix:
  commit-graph: fix memory leak when `fill_oids_from_packs()` fails
diff --git a/commit-graph.c b/commit-graph.c
@@ -1929,6 +1929,8 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
 		}
 		if (open_pack_index(p)) {
 			ret = error(_("error opening index for %s"), packname.buf);
+			close_pack(p);
+			free(p);
 			goto cleanup;
 		}
 		for_each_object_in_pack(p, add_packed_commits, ctx,

Original file line number	Diff line number	Diff line change
`@@ -1929,6 +1929,8 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,`
`1929`	`1929`	`}`
`1930`	`1930`	`if (open_pack_index(p)) {`
`1931`	`1931`	`ret = error(_("error opening index for %s"), packname.buf);`
	`1932`	`+ close_pack(p);`
	`1933`	`+ free(p);`
`1932`	`1934`	`goto cleanup;`
`1933`	`1935`	`}`
`1934`	`1936`	`for_each_object_in_pack(p, add_packed_commits, ctx,`