summaryrefslogtreecommitdiff
path: root/tree.c
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2005-05-04 17:44:15 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 17:58:15 (GMT)
commit13019d413647c4fbd3bb1564bbdf0d934c0a74d7 (patch)
tree571c0f4599fbeefd995bbc24480add1575c36c94 /tree.c
parent705acc5c943e1147e552daf613c679c07b9772d9 (diff)
downloadgit-13019d413647c4fbd3bb1564bbdf0d934c0a74d7.zip
git-13019d413647c4fbd3bb1564bbdf0d934c0a74d7.tar.gz
git-13019d413647c4fbd3bb1564bbdf0d934c0a74d7.tar.bz2
[PATCH] Fix memory leaks in git-fsck-cache
This patch fixes memory leaks in parse_object() and related functions; these leaks were very noticeable when running git-fsck-cache. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'tree.c')
-rw-r--r--tree.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/tree.c b/tree.c
index 72305a3..4a26603 100644
--- a/tree.c
+++ b/tree.c
@@ -101,9 +101,11 @@ int parse_tree(struct tree *item)
if (!buffer)
return error("Could not read %s",
sha1_to_hex(item->object.sha1));
- if (strcmp(type, tree_type))
+ if (strcmp(type, tree_type)) {
+ free(buffer);
return error("Object %s not a tree",
sha1_to_hex(item->object.sha1));
+ }
list_p = &item->entries;
while (size) {
struct object *obj;
@@ -113,8 +115,10 @@ int parse_tree(struct tree *item)
char *path = strchr(bufptr, ' ');
unsigned int mode;
if (size < len + 20 || !path ||
- sscanf(bufptr, "%o", &mode) != 1)
+ sscanf(bufptr, "%o", &mode) != 1) {
+ free(buffer);
return -1;
+ }
entry = xmalloc(sizeof(struct tree_entry_list));
entry->name = strdup(path + 1);
@@ -138,5 +142,6 @@ int parse_tree(struct tree *item)
*list_p = entry;
list_p = &entry->next;
}
+ free(buffer);
return 0;
}