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

* jc/unpack-trees-plug-leak:
  unpack_trees: plug leakage of o->result
This commit is contained in:
Junio C Hamano 2014-12-12 14:31:33 -08:00
commit c09988ad94

View File

@ -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: