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

gitster · gitster · commit c09988ad9403 · 2014-12-12T14:31:33.000-08:00
* jc/unpack-trees-plug-leak:
  unpack_trees: plug leakage of o-&gt;result
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:

Original file line number	Diff line number	Diff line change
`@@ -1155,6 +1155,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options`
`1155`	`1155`	`if (o->dst_index) {`
`1156`	`1156`	`discard_index(o->dst_index);`
`1157`	`1157`	`*o->dst_index = o->result;`
	`1158`	`+ } else {`
	`1159`	`+ discard_index(&o->result);`
`1158`	`1160`	`}`
`1159`	`1161`
`1160`	`1162`	`done:`