mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 21:23:51 +01:00
Code

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

Browse Source 
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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano 2005-06-12 17:23:15 -07:00 committed by Linus Torvalds
parent 206de27efa
commit dc7090efbc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
diff.c
View File

@ -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

2
diffcore.h
View File

@ -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 */
};