Mercurial > vim
changeset 25747:1c999a6e9d92 v8.2.3409
patch 8.2.3409: reading beyond end of line with invalid utf-8 character
Commit: https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Sep 7 19:26:53 2021 +0200
patch 8.2.3409: reading beyond end of line with invalid utf-8 character
Problem: Reading beyond end of line with invalid utf-8 character.
Solution: Check for NUL when advancing.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 07 Sep 2021 19:30:04 +0200 |
parents | 1757d3afd6cb |
children | 8d0ecfbcc62a |
files | src/regexp_nfa.c src/testdir/test_regexp_utf8.vim src/version.c |
diffstat | 3 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -5664,7 +5664,8 @@ find_match_text(colnr_T startcol, int re 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
--- 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