From: Martin Koegler <mkoegler@auto.tuwien.ac.at>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Martin Koegler <mkoegler@auto.tuwien.ac.at>
Subject: [PATCH 06/12] check results of parse_commit in merge_bases
Date: Mon, 18 Feb 2008 21:47:57 +0100 [thread overview]
Message-ID: <12033676831961-git-send-email-mkoegler@auto.tuwien.ac.at> (raw)
In-Reply-To: <12033676833341-git-send-email-mkoegler@auto.tuwien.ac.at>
An error is signaled by returning NULL.
Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
---
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
next prev parent reply other threads:[~2008-02-18 20:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-18 20:47 [PATCH 01/12] read_object_with_reference: don't read beyond the buffer Martin Koegler
2008-02-18 20:47 ` [PATCH 02/12] get_sha1_oneline: check return value of parse_object Martin Koegler
2008-02-18 20:47 ` [PATCH 03/12] mark_blob/tree_uninteresting: check for NULL Martin Koegler
2008-02-18 20:47 ` [PATCH 04/12] add_one_tree: handle NULL from lookup_tree Martin Koegler
2008-02-18 20:47 ` [PATCH 05/12] process_tree/blob: check for NULL Martin Koegler
2008-02-18 20:47 ` Martin Koegler [this message]
2008-02-18 20:47 ` [PATCH 07/12] peel_onion: handle NULL Martin Koegler
2008-02-18 20:47 ` [PATCH 08/12] process_tag: handle tag->tagged == NULL Martin Koegler
2008-02-18 20:48 ` [PATCH 09/12] process_tree/blob: check for NULL Martin Koegler
2008-02-18 20:48 ` [PATCH 10/12] revision.c: handle tag->tagged == NULL Martin Koegler
2008-02-18 20:48 ` [PATCH 11/12] parse_commit: don't fail, if object is NULL Martin Koegler
2008-02-18 20:48 ` [PATCH 12/12] check return value from parse_commit Martin Koegler
2008-02-19 21:31 ` [PATCH 05/12] process_tree/blob: check for NULL Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=12033676831961-git-send-email-mkoegler@auto.tuwien.ac.at \
--to=mkoegler@auto.tuwien.ac.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).