From 5d80ef5a6e727bbecd7d892a5043bae25f7ca5e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Sun, 2 Jun 2013 17:46:57 +0200 Subject: [PATCH] unpack-trees: free cache_entry array members for merges MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. As suggested by Felipe, use the same loop style (zero-based for loop) for freeing as for allocating. Improved-by: Felipe Contreras Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano --- unpack-trees.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 2dbc05d7f7..57b40743a1 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -600,9 +600,16 @@ 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 = 0; i < n; i++) { + struct cache_entry *ce = src[i + o->merge]; + if (ce != o->df_conflict_entry) + free(ce); + } + return rc; + } for (i = 0; i < n; i++) if (src[i] && src[i] != o->df_conflict_entry) -- 2.11.4.GIT