From: Jonathan Nieder Date: Tue, 10 Aug 2010 03:33:44 +0000 (-0500) Subject: read-tree: stop leaking tree objects X-Git-Tag: v1.7.2.3~19^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ce584b05843dfa8b0fe31ed3d75bddf1c29c4e0;p=git.git read-tree: stop leaking tree objects The underlying problem is that the fill_tree_descriptor() API is easy to misuse, and this patch does not fix that. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/unpack-trees.c b/unpack-trees.c index 8cf0da317..f561d8815 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -329,6 +329,7 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long { int i, ret, bottom; struct tree_desc t[MAX_UNPACK_TREES]; + void *buf[MAX_UNPACK_TREES]; struct traverse_info newinfo; struct name_entry *p; @@ -346,12 +347,16 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long const unsigned char *sha1 = NULL; if (dirmask & 1) sha1 = names[i].sha1; - fill_tree_descriptor(t+i, sha1); + buf[i] = fill_tree_descriptor(t+i, sha1); } bottom = switch_cache_bottom(&newinfo); ret = traverse_trees(n, t, &newinfo); restore_cache_bottom(&newinfo, bottom); + + for (i = 0; i < n; i++) + free(buf[i]); + return ret; }