summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinoh Kang <luke1337@theori.io>2020-11-06 17:14:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-06 19:37:07 (GMT)
commit246959346f3407cb047c3d46ed9c44da84bd0b29 (patch)
tree60f01c3e43913becdafbffe2b7df9c850b58e368
parent898f80736c75878acc02dc55672317fcc0e0a5a6 (diff)
downloadgit-246959346f3407cb047c3d46ed9c44da84bd0b29.zip
git-246959346f3407cb047c3d46ed9c44da84bd0b29.tar.gz
git-246959346f3407cb047c3d46ed9c44da84bd0b29.tar.bz2
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>
-rw-r--r--diff.c3
-rwxr-xr-xt/t7800-difftool.sh23
2 files changed, 26 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 2bb2f8f..ffdb08d 100644
--- a/diff.c
+++ b/diff.c
@@ -4111,6 +4111,9 @@ void diff_free_filespec_blob(struct diff_filespec *s)
void diff_free_filespec_data(struct diff_filespec *s)
{
+ if (!s)
+ return;
+
diff_free_filespec_blob(s);
FREE_AND_NULL(s->cnt_data);
}
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 524f30f..e9391ab 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -728,6 +728,29 @@ test_expect_success 'add -N and difftool -d' '
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' '
echo 1 >1 &&
echo 2 >2 &&