mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/regexec-buf'

Browse Source 
Fix for potential segv introduced in v2.11.0 and later (also
v2.10.2).

* js/regexec-buf:
  pickaxe: fix segfault with '-S<...> --pickaxe-regex'
This commit is contained in:
Junio C Hamano
2017-03-24 13:07:35 -07:00
parent 6756b58ebc f53c5de29c
commit 0efeb5ca12
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
diffcore-pickaxe.c
View File

@ -81,12 +81,15 @@ static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
regmatch_t regmatch; regmatch_t regmatch;
int flags = 0; int flags = 0;
while (*data && while (sz && *data &&
!regexec_buf(regexp, data, sz, 1, &regmatch, flags)) { !regexec_buf(regexp, data, sz, 1, &regmatch, flags)) {
flags |= REG_NOTBOL; flags |= REG_NOTBOL;
data += regmatch.rm_eo; data += regmatch.rm_eo;
if (*data && regmatch.rm_so == regmatch.rm_eo) sz -= regmatch.rm_eo;
if (sz && *data && regmatch.rm_so == regmatch.rm_eo) {
data++; data++;
sz--;
}
cnt++; cnt++;
} }

5
t/t4062-diff-pickaxe.sh
View File

@ -19,4 +19,9 @@ test_expect_success '-G matches' '
test 4096-zeroes.txt = "$(cat out)" test 4096-zeroes.txt = "$(cat out)"
' '
test_expect_success '-S --pickaxe-regex' '
git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
verbose test 4096-zeroes.txt = "$(cat out)"
'
test_done test_done