You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.4 KiB
48 lines
1.4 KiB
From 65b605665997fad54ef39a93199e305af2fe4d7f Mon Sep 17 00:00:00 2001 |
|
From: Bram Moolenaar <Bram@vim.org> |
|
Date: Tue, 7 Sep 2021 19:26:53 +0200 |
|
Subject: [PATCH] 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. |
|
--- |
|
src/regexp_nfa.c | 3 ++- |
|
src/testdir/test_regexp_utf8.vim | 8 ++++++++ |
|
src/version.c | 2 ++ |
|
3 files changed, 12 insertions(+), 1 deletion(-) |
|
|
|
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 |
|
-- |
|
2.31.1 |
|
|
|
|