IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

regexp: Fix invalid multibyte reads at end of strings

Browse Source 
Close #3150
This commit is contained in:
Thiago de Arruda 2015-09-08 13:03:09 -03:00
parent c708061a5a
commit 0a116c828d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/regexp_nfa.c
View File

@ -4781,6 +4781,7 @@ static long find_match_text(colnr_T startcol, int regstart, char_u *match_text)
if (match if (match
/* check that no composing char follows */ /* check that no composing char follows */
&& !(enc_utf8 && !(enc_utf8
&& STRLEN(regline) > (size_t)(col + len2)
&& utf_iscomposing(PTR2CHAR(regline + col + len2))) && utf_iscomposing(PTR2CHAR(regline + col + len2)))
) { ) {
cleanup_subexpr(); cleanup_subexpr();

2
src/nvim/search.c
View File

@ -653,7 +653,7 @@ int searchit(
} }
if (matchcol == 0 && (options & SEARCH_START)) if (matchcol == 0 && (options & SEARCH_START))
break; break;
if (ptr[matchcol] == NUL if (STRLEN(ptr) <= (size_t)matchcol || ptr[matchcol] == NUL
|| (nmatched = vim_regexec_multi(&regmatch, || (nmatched = vim_regexec_multi(&regmatch,
win, buf, lnum + matchpos.lnum, win, buf, lnum + matchpos.lnum,
matchcol, matchcol,