aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-24 14:31:57 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-24 14:31:57 -0700
commit235ac40772e259adfd978850b56192dca9791bb8 (patch)
treef74ed93cd9e524e798eb06ad59df494ce866ebc9
parentc35dfe858991ee1969870d2da9337a1da567157e (diff)
downloadgit-235ac40772e259adfd978850b56192dca9791bb8.tar.gz
git-235ac40772e259adfd978850b56192dca9791bb8.tar.xz
Don't add references to objects we couldn't find.
That would SIGSEGV.
-rw-r--r--commit.c9
-rw-r--r--tree.c3
2 files changed, 8 insertions, 4 deletions
diff --git a/commit.c b/commit.c
index c6fdfd491..9fbcbd33c 100644
--- a/commit.c
+++ b/commit.c
@@ -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);
diff --git a/tree.c b/tree.c
index 3537c1155..26b792708 100644
--- a/tree.c
+++ b/tree.c
@@ -137,7 +137,8 @@ int parse_tree(struct tree *item)
entry->item.blob = lookup_blob(file_sha1);
obj = &entry->item.blob->object;
}
- add_ref(&item->object, obj);
+ if (obj)
+ add_ref(&item->object, obj);
*list_p = entry;
list_p = &entry->next;