[PATCH] Fix memory leaks in git-fsck-cache

[thirdparty/git.git] / commit.c

diff --git a/commit.c b/commit.c
index 911f6435a74b93f6d25c6852d1814fa8dbaf626e..b45118a544276797f6bc9c0f482c187647f0e88d 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -9,12 +9,13 @@ struct commit *lookup_commit(unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
-               struct commit *ret = malloc(sizeof(struct commit));
+               struct commit *ret = xmalloc(sizeof(struct commit));
                memset(ret, 0, sizeof(struct commit));
                created_object(sha1, &ret->object);
+               ret->object.type = commit_type;
                return ret;
        }
-       if (obj->parsed && obj->type != commit_type) {
+       if (obj->type != commit_type) {
                error("Object %s is a %s, not a commit", 
                      sha1_to_hex(sha1), obj->type);
                return NULL;
@@ -53,19 +54,23 @@ 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));
-       item->object.type = commit_type;
+       }
        get_sha1_hex(bufptr + 5, parent);
        item->tree = lookup_tree(parent);
-       add_ref(&item->object, &item->tree->object);
+       if (item->tree)
+               add_ref(&item->object, &item->tree->object);
        bufptr += 46; /* "tree " + "hex sha1" + "\n" */
        while (!memcmp(bufptr, "parent ", 7) &&
               !get_sha1_hex(bufptr + 7, parent)) {
                struct commit *new_parent = lookup_commit(parent);
-               commit_list_insert(new_parent, &item->parents);
-               add_ref(&item->object, &new_parent->object);
+               if (new_parent) {
+                       commit_list_insert(new_parent, &item->parents);
+                       add_ref(&item->object, &new_parent->object);
+               }
                bufptr += 48;
        }
        item->date = parse_commit_date(bufptr);
@@ -75,7 +80,7 @@ int parse_commit(struct commit *item)
 
 void commit_list_insert(struct commit *item, struct commit_list **list_p)
 {
-       struct commit_list *new_list = malloc(sizeof(struct commit_list));
+       struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
        new_list->item = item;
        new_list->next = *list_p;
        *list_p = new_list;
@@ -114,7 +119,8 @@ void sort_by_date(struct commit_list **list)
        *list = ret;
 }
 
-struct commit *pop_most_recent_commit(struct commit_list **list)
+struct commit *pop_most_recent_commit(struct commit_list **list,
+                                     unsigned int mark)
 {
        struct commit *ret = (*list)->item;
        struct commit_list *parents = ret->parents;
@@ -124,8 +130,12 @@ struct commit *pop_most_recent_commit(struct commit_list **list)
        free(old);
 
        while (parents) {
-               parse_commit(parents->item);
-               insert_by_date(list, parents->item);
+               struct commit *commit = parents->item;
+               parse_commit(commit);
+               if (!(commit->object.flags & mark)) {
+                       commit->object.flags |= mark;
+                       insert_by_date(list, commit);
+               }
                parents = parents->next;
        }
        return ret;