From dc7090efbc8280e482a6b2dc7419e525cbc3c5d7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 12 Jun 2005 17:23:15 -0700 Subject: [PATCH] [PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p When an unmerged path was fed via diff_unmerged() into diffcore, it eventually called run_diff() with "one" and "two" parameters with NULL, but run_diff() was not written carefully enough to notice this situation. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff.c | 1 + diffcore.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/diff.c b/diff.c index 046d9a392..dd1c0b6d5 100644 --- a/diff.c +++ b/diff.c @@ -555,6 +555,7 @@ static void run_diff(const char *name, { const char *pgm = external_diff(); if (!pgm && + one && two && DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) && (S_IFMT & one->mode) != (S_IFMT & two->mode)) { /* a filepair that changes between file and symlink diff --git a/diffcore.h b/diffcore.h index ac159d715..f1b5ca748 100644 --- a/diffcore.h +++ b/diffcore.h @@ -33,7 +33,7 @@ struct diff_filespec { * if false, use the name and read from * the filesystem. */ -#define DIFF_FILE_VALID(spec) ((spec) && ((spec)->mode) != 0) +#define DIFF_FILE_VALID(spec) (((spec)->mode) != 0) unsigned should_free : 1; /* data should be free()'ed */ unsigned should_munmap : 1; /* data should be munmap()'ed */ }; -- 2.26.2