[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>

diff --git a/blob.c b/blob.c
index d4af4a309433744d2fe819886d66741ab016f62b..625db43971182e14eacc64f6514c16dd45644c86 100644 (file)
--- 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));
         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));
         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 3956c7ba961781f72b39c42368df1e76b2d035dd..b45118a544276797f6bc9c0f482c187647f0e88d 100644 (file)
--- 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 (!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));
                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)
        get_sha1_hex(bufptr + 5, parent);
        item->tree = lookup_tree(parent);
        if (item->tree)

diff --git a/object.c b/object.c
index ca4af8fa2dc0672b92310a3ebdd4d14bf070dd69..c1f22910a2e207997fbc627ee8150a81b813c3b0 100644 (file)
--- 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);
                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));
                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);
                if (!strcmp(type, "blob")) {
                        struct blob *ret = lookup_blob(sha1);
                        parse_blob(ret);

diff --git a/tag.c b/tag.c
index 406dba2aa5607332fe022fcba1beb045fa61c5f4..9eade750d373791420739e494b8f0f0d7367675f 100644 (file)
--- 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 (!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));
                 return error("Object %s not a tag",
                              sha1_to_hex(item->object.sha1));

+       }

 
        if (size < 64)
 
        if (size < 64)

-               return -1;
+               goto err;

        if (memcmp("object ", data, 7) || get_sha1_hex(data + 7, object))
        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))
 
        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))
 
        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)
 
        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)
        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';
 
        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;
        return 0;

+
+err:
+       free(data);
+       return -1;

 }
 }

diff --git a/tree.c b/tree.c
index 72305a357b6694cdb1b29dad9975902fdef86457..4a26603f6e32866c0db8a01ac1c228be801f76c6 100644 (file)
--- 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 (!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));
                return error("Object %s not a tree",
                             sha1_to_hex(item->object.sha1));

+       }

        list_p = &item->entries;
        while (size) {
                struct object *obj;
        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 || 
                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;
                        return -1;

+               }

 
                entry = xmalloc(sizeof(struct tree_entry_list));
                entry->name = strdup(path + 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;
        }
                *list_p = entry;
                list_p = &entry->next;
        }

+       free(buffer);

        return 0;
 }
        return 0;
 }