diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-29 23:49:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 23:49:45 (GMT) |
| commit | 300e95f7df240a0f6efea09d5e21fcc350e5ce83 (patch) | |
| tree | 0b2a114656894e4177030ad6019e5581b3981d4c /Makefile | |
| parent | d336b675680c7d4adc9f7190b7974b2ef10c0af4 (diff) | |
| parent | b7d36ffca02c23f545d6e098d78180e6e72dfd8d (diff) | |
| download | git-300e95f7df240a0f6efea09d5e21fcc350e5ce83.zip git-300e95f7df240a0f6efea09d5e21fcc350e5ce83.tar.gz git-300e95f7df240a0f6efea09d5e21fcc350e5ce83.tar.bz2 | |
Merge branch 'js/regexec-buf' into maint
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 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -301,7 +301,8 @@ all:: # crashes due to allocation and free working on different 'heaps'. # It's defined automatically if USE_NED_ALLOCATOR is set. # -# Define NO_REGEX if you have no or inferior regex support in your C library. +# Define NO_REGEX if your C library lacks regex support with REG_STARTEND +# feature. # # Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the # user. |