From: René Scharfe Date: Thu, 30 May 2013 11:34:24 GMT Subject: [PATCH 7/7] unpack-trees: free cache_entry array members for merges Message-ID: <1369913664-49734-8-git-send-email-rene.scharfe@lsrfire.ath.cx> In-Reply-To: <1369913664-49734-1-git-send-email-rene.scharfe@lsrfire.ath.cx> 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. Signed-off-by: René Scharfe --- unpack-trees.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 2dbc05d..fc0dd5a 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -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]); + return rc; + } for (i = 0; i < n; i++) if (src[i] && src[i] != o->df_conflict_entry) -- 1.8.3