summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-26 16:09:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-26 16:09:19 -0700
commit6a67695268562f67babdb7d5195c8a43cc4015fa (patch)
treeb5bbacc08e466f6de62cf2e9fd450d71ef0ea6c7 /git-merge-one-file.sh
parentMerge branch 'nd/checkout-disambiguation' (diff)
parentregex: use regexec_buf() (diff)
downloadtgif-6a67695268562f67babdb7d5195c8a43cc4015fa.tar.xz
Merge branch 'js/regexec-buf'
Some codepaths in "git diff" used regexec(3) on a buffer that was mmap(2)ed, which may not have a terminating NUL, leading to a read beyond the end of the mapped region. This was fixed by introducing a regexec_buf() helper that takes a <ptr,len> pair with REG_STARTEND extension. * js/regexec-buf: regex: use regexec_buf() regex: add regexec_buf() that can work on a non NUL-terminated string regex: -G<pattern> feeds a non NUL-terminated string to regexec() and fails
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions