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

* jc/unpack-trees-plug-leak:
unpack_trees: plug leakage of o->result

diff --git a/unpack-trees.c b/unpack-trees.c
index 629c658c46a1b4f4bcd8bbe9770d7fd767ae2216..3a66849e38b1940b1f3fc9c542ea864a86278687 100644 (file)
--- 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: