undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't add references to objects we couldn't find.

Browse Source 
That would SIGSEGV.
This commit is contained in:
Linus Torvalds 2005-04-24 14:31:57 -07:00
parent c35dfe8589
commit 235ac40772
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
commit.c
View File

@ -59,13 +59,16 @@ int parse_commit(struct commit *item)
sha1_to_hex(item->object.sha1)); sha1_to_hex(item->object.sha1));
get_sha1_hex(bufptr + 5, parent); get_sha1_hex(bufptr + 5, parent);
item->tree = lookup_tree(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" */ bufptr += 46; /* "tree " + "hex sha1" + "\n" */
while (!memcmp(bufptr, "parent ", 7) && while (!memcmp(bufptr, "parent ", 7) &&
!get_sha1_hex(bufptr + 7, parent)) { !get_sha1_hex(bufptr + 7, parent)) {
struct commit *new_parent = lookup_commit(parent); struct commit *new_parent = lookup_commit(parent);
commit_list_insert(new_parent, &item->parents); if (new_parent) {
add_ref(&item->object, &new_parent->object); commit_list_insert(new_parent, &item->parents);
add_ref(&item->object, &new_parent->object);
}
bufptr += 48; bufptr += 48;
} }
item->date = parse_commit_date(bufptr); item->date = parse_commit_date(bufptr);

3
tree.c
View File

@ -137,7 +137,8 @@ int parse_tree(struct tree *item)
entry->item.blob = lookup_blob(file_sha1); entry->item.blob = lookup_blob(file_sha1);
obj = &entry->item.blob->object; obj = &entry->item.blob->object;
} }
add_ref(&item->object, obj); if (obj)
add_ref(&item->object, obj);
*list_p = entry; *list_p = entry;
list_p = &entry->next; list_p = &entry->next;