summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2017-06-27 19:03:30 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-27 10:58:30 -0700
commit4269974179ff4fc2a970c972330ba5b7f26a323b (patch)
tree86b9aa02c0176cf03b2aab35eff21c586c897d5c /git-mergetool--lib.sh
parentGit 2.11.2 (diff)
downloadtgif-4269974179ff4fc2a970c972330ba5b7f26a323b.tar.xz
apply: check git diffs for missing old filenames
2c93286a (fix "git apply --index ..." not to deref NULL) added a check for git patches missing a +++ line, preventing a segfault. Check for missing --- lines as well, and add a test for each case. Found by Vegard Nossum using AFL. Original-patch-by: Vegard Nossum <vegard.nossum@oracle.com> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions