From: Martin Koegler Date: Mon, 18 Feb 2008 20:47:57 GMT Subject: [PATCH 06/12] check results of parse_commit in merge_bases Message-ID: <12033676831961-git-send-email-mkoegler@auto.tuwien.ac.at> In-Reply-To: <12033676833341-git-send-email-mkoegler@auto.tuwien.ac.at> An error is signaled by returning NULL. Signed-off-by: Martin Koegler --- commit.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/commit.c b/commit.c index 8b8fb04..70f1266 100644 --- a/commit.c +++ b/commit.c @@ -552,8 +552,10 @@ static struct commit_list *merge_bases(struct commit *one, struct commit *two) */ return commit_list_insert(one, &result); - parse_commit(one); - parse_commit(two); + if (parse_commit(one)) + return NULL; + if (parse_commit(two)) + return NULL; one->object.flags |= PARENT1; two->object.flags |= PARENT2; @@ -586,7 +588,8 @@ static struct commit_list *merge_bases(struct commit *one, struct commit *two) parents = parents->next; if ((p->object.flags & flags) == flags) continue; - parse_commit(p); + if (parse_commit(p)) + return NULL; p->object.flags |= flags; insert_by_date(p, &list); } -- 1.5.4.1.g96b77