Merge branch 'jc/unpack-trees-plug-leak'

* jc/unpack-trees-plug-leak: unpack_trees: plug leakage of o->result
git-mirror · Dec 12, 2014 · c09988a · c09988a
2 parents c18b867 + a16cc8b
commit c09988a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -1155,6 +1155,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 	if (o->dst_index) {
 		discard_index(o->dst_index);
 		*o->dst_index = o->result;
+	} else {
+		discard_index(&o->result);
 	}
 
 done: