aboutsummaryrefslogtreecommitdiff
path: root/tag.c
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2005-05-04 21:44:15 +0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 10:58:15 -0700
commit13019d413647c4fbd3bb1564bbdf0d934c0a74d7 (patch)
tree571c0f4599fbeefd995bbc24480add1575c36c94 /tag.c
parent705acc5c943e1147e552daf613c679c07b9772d9 (diff)
downloadgit-13019d413647c4fbd3bb1564bbdf0d934c0a74d7.tar.gz
git-13019d413647c4fbd3bb1564bbdf0d934c0a74d7.tar.xz
[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 'tag.c')
-rw-r--r--tag.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/tag.c b/tag.c
index 406dba2aa..9eade750d 100644
--- a/tag.c
+++ b/tag.c
@@ -37,37 +37,44 @@ int parse_tag(struct tag *item)
if (!data)
return error("Could not read %s",
sha1_to_hex(item->object.sha1));
- if (strcmp(type, tag_type))
+ if (strcmp(type, tag_type)) {
+ free(data);
return error("Object %s not a tag",
sha1_to_hex(item->object.sha1));
+ }
if (size < 64)
- return -1;
+ goto err;
if (memcmp("object ", data, 7) || get_sha1_hex(data + 7, object))
- return -1;
+ goto err;
item->tagged = parse_object(object);
type_line = data + 48;
if (memcmp("\ntype ", type_line-1, 6))
- return -1;
+ goto err;
tag_line = strchr(type_line, '\n');
if (!tag_line || memcmp("tag ", ++tag_line, 4))
- return -1;
+ goto err;
sig_line = strchr(tag_line, '\n');
if (!sig_line)
- return -1;
+ goto err;
sig_line++;
typelen = tag_line - type_line - strlen("type \n");
if (typelen >= 20)
- return -1;
+ goto err;
taglen = sig_line - tag_line - strlen("tag \n");
item->tag = xmalloc(taglen + 1);
memcpy(item->tag, tag_line + 4, taglen);
item->tag[taglen] = '\0';
+ free(data);
return 0;
+
+err:
+ free(data);
+ return -1;
}