Skip to content

Commit

Permalink
patch 8.2.3409: reading beyond end of line with invalid utf-8 character
Browse files Browse the repository at this point in the history
Problem:    Reading beyond end of line with invalid utf-8 character.
Solution:   Check for NUL when advancing.
  • Loading branch information
brammool committed Sep 7, 2021
1 parent ddfc051 commit 65b6056
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/regexp_nfa.c
Expand Up @@ -5664,7 +5664,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text)
match = FALSE;
break;
}
len2 += MB_CHAR2LEN(c2);
len2 += enc_utf8 ? utf_ptr2len(rex.line + col + len2)
: MB_CHAR2LEN(c2);
}
if (match
// check that no composing char follows
Expand Down
8 changes: 8 additions & 0 deletions src/testdir/test_regexp_utf8.vim
Expand Up @@ -558,4 +558,12 @@ func Test_match_char_class_upper()
bwipe!
endfunc

func Test_match_invalid_byte()
call writefile(0z630a.765d30aa0a.2e0a.790a.4030, 'Xinvalid')
new
source Xinvalid
bwipe!
call delete('Xinvalid')
endfunc

" vim: shiftwidth=2 sts=2 expandtab
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -755,6 +755,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3409,
/**/
3408,
/**/
Expand Down

0 comments on commit 65b6056

Please sign in to comment.