kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff: allow passing NULL to diff_free_filespec_data() 

Commit 3aef54e8b8 ("diff: munmap() file contents before running external
diff") introduced calls to diff_free_filespec_data in
run_external_diff, which may pass NULL pointers.

Fix this and prevent any such bugs in the future by making
`diff_free_filespec_data(NULL)` a no-op.

Fixes: 3aef54e8b8 ("diff: munmap() file contents before running external diff")
Signed-off-by: Jinoh Kang <luke1337@theori.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jinoh Kang 2020-11-06 17:14:52 +00:00 committed by Junio C Hamano
parent 898f80736c
commit 246959346f
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diff.c
View File

@ -4111,6 +4111,9 @@ void diff_free_filespec_blob(struct diff_filespec *s)


void diff_free_filespec_data(struct diff_filespec *s) void diff_free_filespec_data(struct diff_filespec *s)
{ {
if (!s)
return;

diff_free_filespec_blob(s); diff_free_filespec_blob(s);
FREE_AND_NULL(s->cnt_data); FREE_AND_NULL(s->cnt_data);
} }

23
t/t7800-difftool.sh
View File

@ -728,6 +728,29 @@ test_expect_success 'add -N and difftool -d' '
git difftool --dir-diff --extcmd ls git difftool --dir-diff --extcmd ls
' '


test_expect_success 'difftool --cached with unmerged files' '
test_when_finished git reset --hard &&
echo base >file &&
git add file &&
git commit -m base &&
git checkout -B conflict-a &&
git checkout -B conflict-b &&
git checkout conflict-a &&
echo conflict-a >>file &&
git add file &&
git commit -m conflict-a &&
git checkout conflict-b &&
echo conflict-b >>file &&
git add file &&
git commit -m conflict-b &&
git checkout master &&
git merge conflict-a &&
test_must_fail git merge conflict-b &&
: >expect &&
git difftool --cached --no-prompt >actual &&
test_cmp expect actual
'

test_expect_success 'outside worktree' ' test_expect_success 'outside worktree' '
echo 1 >1 && echo 1 >1 &&
echo 2 >2 && echo 2 >2 &&