From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Tue, 13 Aug 2013 18:27:58 +0000 (+0200)
Subject: unpack-trees: plug a memory leak
X-Git-Tag: v1.8.5-rc0~183^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e28f7641592c5b907df2f084112fa22a31500810

unpack-trees: plug a memory leak

Before overwriting the destination index, first let's discard its
contents.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Tested-by: Лежанкин Иван <abyss.7@gmail.com> wrote:
Reviewed-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/unpack-trees.c b/unpack-trees.c
index bf01717015..1a61e6f363 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1154,8 +1154,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 
 	o->src_index = NULL;
 	ret = check_updates(o) ? (-2) : 0;
-	if (o->dst_index)
+	if (o->dst_index) {
+		discard_index(o->dst_index);
 		*o->dst_index = o->result;
+	}
 
 done:
 	clear_exclude_list(&el);