unpack_trees: plug leakage of o->result

gitster · gitster · commit a16cc8b24710 · 2014-11-17T13:34:07.000-08:00
Most of the time the caller specifies to which destination variable
the resulting index_state should be assigned by passing a non-NULL
pointer in o-&gt;dst_index to receive that state, but for a caller that
gives a NULL o-&gt;dst_index, the resulting index simply leaked.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -1157,6 +1157,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
`@@ -1157,6 +1157,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options`
`1157`	`1157`	`if (o->dst_index) {`
`1158`	`1158`	`discard_index(o->dst_index);`
`1159`	`1159`	`*o->dst_index = o->result;`
	`1160`	`+ } else {`
	`1161`	`+ discard_index(&o->result);`
`1160`	`1162`	`}`
`1161`	`1163`
`1162`	`1164`	`done:`