Skip to content

Commit

Permalink
Don't add references to objects we couldn't find.
Browse files Browse the repository at this point in the history
That would SIGSEGV.
  • Loading branch information
Linus Torvalds committed Apr 24, 2005
1 parent c35dfe8 commit 235ac40
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
9 changes: 6 additions & 3 deletions commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 235ac40

Please sign in to comment.