summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-10-11 23:16:02 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-12 01:10:38 (GMT)
commit14763e7bda06a502455ef4420067205797b9a907 (patch)
treee5e84d965d674e7536875491a3f7b7c98f7b7344
parentb203b769f2f382307f21b4a021ce08f9a4cfa94c (diff)
downloadgit-14763e7bda06a502455ef4420067205797b9a907.zip
git-14763e7bda06a502455ef4420067205797b9a907.tar.gz
git-14763e7bda06a502455ef4420067205797b9a907.tar.bz2
commit: fix a segfault when displaying a commit with unreachable parents
I was running git show on various commits found by fsck-objects when I found this bug. Since find_unique_abbrev() cannot find an abbreviation for an object not in the database, it will return NULL, which is bad to run strlen() on. So instead, we'll just display the unabbreviated sha1 that we referenced in the commit. I'm not sure that this is the best 'fix' for it because the commit I was trying to show was broken, but I don't think a program should segfault even if the user tries to do something stupid. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--commit.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/commit.c b/commit.c
index 5b6e082..a6d543e 100644
--- a/commit.c
+++ b/commit.c
@@ -548,10 +548,13 @@ static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
while (parent) {
struct commit *p = parent->item;
- const char *hex = abbrev
- ? find_unique_abbrev(p->object.sha1, abbrev)
- : sha1_to_hex(p->object.sha1);
- const char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
+ const char *hex = NULL;
+ const char *dots;
+ if (abbrev)
+ hex = find_unique_abbrev(p->object.sha1, abbrev);
+ if (!hex)
+ hex = sha1_to_hex(p->object.sha1);
+ dots = (abbrev && strlen(hex) != 40) ? "..." : "";
parent = parent->next;
offset += sprintf(buf + offset, " %s%s", hex, dots);