diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-09-07 19:26:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-09-07 19:26:53 +0200 |
| commit | 65b605665997fad54ef39a93199e305af2fe4d7f (patch) | |
| tree | 2d8c3f5bd283e794dd2c3911b46f9a7485e09365 | |
| parent | ddfc05100a29263a682dd96bb924dfde4354a654 (diff) | |
| download | vim-git-65b605665997fad54ef39a93199e305af2fe4d7f.tar.gz | |
patch 8.2.3409: reading beyond end of line with invalid utf-8 characterv8.2.3409
Problem: Reading beyond end of line with invalid utf-8 character.
Solution: Check for NUL when advancing.
| -rw-r--r-- | src/regexp_nfa.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_regexp_utf8.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 9757d7c47..c7db98187 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -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 diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim index 9f0ffb9aa..044aeffb6 100644 --- a/src/testdir/test_regexp_utf8.vim +++ b/src/testdir/test_regexp_utf8.vim @@ -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 diff --git a/src/version.c b/src/version.c index 54533dc91..0eb6899ed 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3409, +/**/ 3408, /**/ 3407, |