summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-10-24 04:52:36 -0400
committerJunio C Hamano <gitster@pobox.com>2013-10-24 15:43:50 -0700
commit7059dccc6c60a872a314b19ac17702065a71d6bd (patch)
tree7fd82703079885e1adb864e8a8f185fdc6b45c8e /commit.c
parente230c568c4b9a991e3175e5f65171a566fd8e39c (diff)
downloadgit-7059dccc6c60a872a314b19ac17702065a71d6bd.tar.gz
log_tree_diff: die when we fail to parse a commit
We currently call parse_commit and then assume we can dereference the resulting "tree" struct field. If parsing failed, however, that field is NULL and we end up segfaulting. Instead of a segfault, let's print an error message and die a little more gracefully. Note that this should never happen in practice, but may happen in a corrupt repository. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/commit.c b/commit.c
index a575564a15..26c1d5406d 100644
--- a/commit.c
+++ b/commit.c
@@ -341,6 +341,13 @@ int parse_commit(struct commit *item)
return ret;
}
+void parse_commit_or_die(struct commit *item)
+{
+ if (parse_commit(item))
+ die("unable to parse commit %s",
+ item ? sha1_to_hex(item->object.sha1) : "(null)");
+}
+
int find_commit_subject(const char *commit_buffer, const char **subject)
{
const char *eol;