summaryrefslogtreecommitdiff
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
parent705acc5c943e1147e552daf613c679c07b9772d9 (diff)
downloadgit-13019d413647c4fbd3bb1564bbdf0d934c0a74d7.tar.gz
[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>
-rw-r--r--blob.c1
-rw-r--r--commit.c4
-rw-r--r--object.c3
-rw-r--r--tag.c21
-rw-r--r--tree.c9
5 files changed, 27 insertions, 11 deletions
diff --git a/blob.c b/blob.c
index d4af4a3094..625db43971 100644
--- a/blob.c
+++ b/blob.c
@@ -34,6 +34,7 @@ int parse_blob(struct blob *item)
if (!buffer)
return error("Could not read %s",
sha1_to_hex(item->object.sha1));
+ free(buffer);
if (strcmp(type, blob_type))
return error("Object %s not a blob",
sha1_to_hex(item->object.sha1));
diff --git a/commit.c b/commit.c
index 3956c7ba96..b45118a544 100644
--- a/commit.c
+++ b/commit.c
@@ -54,9 +54,11 @@ int parse_commit(struct commit *item)
if (!buffer)
return error("Could not read %s",
sha1_to_hex(item->object.sha1));
- if (strcmp(type, commit_type))
+ if (strcmp(type, commit_type)) {
+ free(buffer);
return error("Object %s not a commit",
sha1_to_hex(item->object.sha1));
+ }
get_sha1_hex(bufptr + 5, parent);
item->tree = lookup_tree(parent);
if (item->tree)
diff --git a/object.c b/object.c
index ca4af8fa2d..c1f22910a2 100644
--- a/object.c
+++ b/object.c
@@ -107,11 +107,12 @@ struct object *parse_object(unsigned char *sha1)
char type[100];
unsigned long size;
void *buffer = unpack_sha1_file(map, mapsize, type, &size);
+ munmap(map, mapsize);
if (!buffer)
return NULL;
if (check_sha1_signature(sha1, buffer, size, type) < 0)
printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
- munmap(map, mapsize);
+ free(buffer);
if (!strcmp(type, "blob")) {
struct blob *ret = lookup_blob(sha1);
parse_blob(ret);
diff --git a/tag.c b/tag.c
index 406dba2aa5..9eade750d3 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;
}
diff --git a/tree.c b/tree.c
index 72305a357b..4a26603f6e 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;
}