Re: [PATCH 7/7] unpack-trees: free cache_entry array members for merges
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:30
On Thu, May 30, 2013 at 6:34 AM, René Scharfe [off-list ref] wrote:
The merge functions duplicate entries as needed and they don't free them. Release them in unpack_nondirectories, the same function where they were allocated, after we're done.
Ah, you beat me to this change, but..
quoted hunk ↗ jump to hunk
@@ -600,9 +600,14 @@ static int unpack_nondirectories(int n, unsigned long mask, src[i + o->merge] = create_ce_entry(info, names + i, stage); } - if (o->merge) - return call_unpack_fn((const struct cache_entry * const *)src, - o); + if (o->merge) { + int rc = call_unpack_fn((const struct cache_entry * const *)src, + o); + for (i = 1; i <= n; i++) + if (src[i] && src[i] != o->df_conflict_entry) + free(src[i]);
Doesn't it make more sense to follow the code above and do src[i + o->merge]? -- Felipe Contreras