Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  revert: Fix trivial comment style issue
  cache_tree_free: Fix small memory leak

Conflicts:
	builtin/revert.c
  • Loading branch information
Junio C Hamano committed Sep 7, 2010
2 parents 79d532c + 04df568 commit 7505ae2
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion cache-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ void cache_tree_free(struct cache_tree **it_p)
if (!it)
return;
for (i = 0; i < it->subtree_nr; i++)
if (it->down[i])
if (it->down[i]) {
cache_tree_free(&it->down[i]->cache_tree);
free(it->down[i]);
}
free(it->down);
free(it);
*it_p = NULL;
Expand Down

0 comments on commit 7505ae2

Please sign in to comment.