Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/unpack-trees-plug-leak'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 12 Dec 2014 22:31:33 +0000
(14:31 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 12 Dec 2014 22:31:33 +0000
(14:31 -0800)
* jc/unpack-trees-plug-leak:
unpack_trees: plug leakage of o->result
unpack-trees.c
patch
|
blob
|
history
raw
(from parent 1:
c18b867
)
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: