Merge branch 'fc/unpack-trees-leakfix'

* fc/unpack-trees-leakfix: unpack-trees: plug a memory leak
git-mirror · Sep 4, 2013 · 94f0069 · 94f0069
2 parents a62b071 + e28f764
commit 94f0069
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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);