summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-15 02:59:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-15 02:59:14 (GMT)
commitb599672316ae0e0cf827e5e2cd6d3bb403d7b8cd (patch)
tree3214dc21b1fd0945d4f3760ba5f121324fd6ee97
parent9b2504831859ffdffbe15b9a6a7b7ede37557b06 (diff)
parentef0065034a68edfc0ffed9965bb895073ad710db (diff)
downloadgit-b599672316ae0e0cf827e5e2cd6d3bb403d7b8cd.zip
git-b599672316ae0e0cf827e5e2cd6d3bb403d7b8cd.tar.gz
git-b599672316ae0e0cf827e5e2cd6d3bb403d7b8cd.tar.bz2
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: fix minor memory leak in get_tree_entry()
-rw-r--r--tree-walk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 08796c2..67a9a0c 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -441,6 +441,7 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
if (name[0] == '\0') {
hashcpy(sha1, root);
+ free(tree);
return 0;
}