undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-tree: stop leaking tree objects

Browse Source 
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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-08-09 22:33:44 -05:00 committed by Junio C Hamano
parent 59efba64ac
commit 1ce584b058
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
unpack-trees.c
View File

@ -329,6 +329,7 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long
{ {
int i, ret, bottom; int i, ret, bottom;
struct tree_desc t[MAX_UNPACK_TREES]; struct tree_desc t[MAX_UNPACK_TREES];
void *buf[MAX_UNPACK_TREES];
struct traverse_info newinfo; struct traverse_info newinfo;
struct name_entry *p; 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; const unsigned char *sha1 = NULL;
if (dirmask & 1) if (dirmask & 1)
sha1 = names[i].sha1; sha1 = names[i].sha1;
fill_tree_descriptor(t+i, sha1); buf[i] = fill_tree_descriptor(t+i, sha1);
} }
bottom = switch_cache_bottom(&newinfo); bottom = switch_cache_bottom(&newinfo);
ret = traverse_trees(n, t, &newinfo); ret = traverse_trees(n, t, &newinfo);
restore_cache_bottom(&newinfo, bottom); restore_cache_bottom(&newinfo, bottom);
for (i = 0; i < n; i++)
free(buf[i]);
return ret; return ret;
} }