mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7993 from blueyed/vim-8.0.1483

Browse Source 
vim-patch:8.0.1483: searchpair() might return an invalid value on timeout
This commit is contained in:
Justin M. Keyes
2018-02-10 23:18:04 +01:00
committed by GitHub
parent 34b99bc06b d929a41f5f
commit c205360f00
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/search.c
View File

@@ -775,12 +775,17 @@ int searchit(
} }
} }
if (ptr[matchcol] == NUL if (ptr[matchcol] == NUL
|| (nmatched = vim_regexec_multi(&regmatch, || (nmatched = vim_regexec_multi(
win, buf, lnum + matchpos.lnum, &regmatch, win, buf, lnum + matchpos.lnum, matchcol,
matchcol, tm)) == 0) {
tm // If the search timed out, we did find a match
)) == 0) // but it might be the wrong one, so that's not
break; // OK.
if (tm != NULL && profile_passed_limit(*tm)) {
match_ok = false;
}
break;
}
/* Need to get the line pointer again, a /* Need to get the line pointer again, a
* multi-line search may have made it invalid. */ * multi-line search may have made it invalid. */