X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=commit.c;h=3956c7ba961781f72b39c42368df1e76b2d035dd;hb=ec8f81160d605505f9117461916e7f69f151f2d2;hp=c0dd689ea3be3ef8d161cac056350e61851e7f64;hpb=d32987be618181db1f435a5c0a1bea85e90c7c7d;p=git.git

diff --git a/commit.c b/commit.c
index c0dd689e..3956c7ba 100644
--- a/commit.c
+++ b/commit.c
@@ -9,13 +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;
@@ -59,13 +59,16 @@ int parse_commit(struct commit *item)
 			     sha1_to_hex(item->object.sha1));
 	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 +78,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;