Fix SIGSEGV on unmerged files in git-diff-files -p

NULL is not considered a VALID pathspec.
git-for-windows · Jun 8, 2005 · f9e7750 · f9e7750
1 parent 7d95ee9
commit f9e7750
Showing 1 changed file with 1 addition and 1 deletion.
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)->mode) != 0)
+#define DIFF_FILE_VALID(spec) ((spec) && ((spec)->mode) != 0)
 	unsigned should_free : 1; /* data should be free()'ed */
 	unsigned should_munmap : 1; /* data should be munmap()'ed */
 };