Skip to content

Commit

Permalink
check return value from parse_commit() in various functions
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Martin Koegler authored and Junio C Hamano committed Feb 19, 2008
1 parent 9786f68 commit dec38c8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 1 addition & 2 deletions commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,7 @@ struct commit *pop_most_recent_commit(struct commit_list **list,

while (parents) {
struct commit *commit = parents->item;
parse_commit(commit);
if (!(commit->object.flags & mark)) {
if (!parse_commit(commit) && !(commit->object.flags & mark)) {
commit->object.flags |= mark;
insert_by_date(commit, list);
}
Expand Down
3 changes: 2 additions & 1 deletion shallow.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
cur_depth = *(int *)commit->util;
}
}
parse_commit(commit);
if (parse_commit(commit))
die("invalid commit");
commit->object.flags |= not_shallow_flag;
cur_depth++;
for (p = commit->parents, commit = NULL; p; p = p->next) {
Expand Down
3 changes: 2 additions & 1 deletion upload-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,8 @@ static void receive_needs(void)
/* make sure the real parents are parsed */
unregister_shallow(object->sha1);
object->parsed = 0;
parse_commit((struct commit *)object);
if (parse_commit((struct commit *)object))
die("invalid commit");
parents = ((struct commit *)object)->parents;
while (parents) {
add_object_array(&parents->item->object,
Expand Down

0 comments on commit dec38c8

Please sign in to comment.