[PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p

Junio C Hamano · Linus Torvalds · commit dc7090efbc82 · 2005-06-12T20:29:31.000-07:00
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 &lt;junkio@cox.net&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git 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
@@ -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 */
 };

Original file line number	Diff line number	Diff line change
`@@ -555,6 +555,7 @@ static void run_diff(const char *name,`
`555`	`555`	`{`
`556`	`556`	`const char *pgm = external_diff();`
`557`	`557`	`if (!pgm &&`
	`558`	`+ one && two &&`
`558`	`559`	`DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&`
`559`	`560`	`(S_IFMT & one->mode) != (S_IFMT & two->mode)) {`
`560`	`561`	`/* a filepair that changes between file and symlink`