Merge branch 'fc/unpack-trees-leakfix'

* fc/unpack-trees-leakfix:
unpack-trees: plug a memory leak

diff --git a/unpack-trees.c b/unpack-trees.c
index bf01717015b662cec594d2d3c73e57f409037533..1a61e6f363d6a03b262ad5e5a28c58c2caf722d5 100644 (file)
--- 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);