47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
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 ++++++++
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
|
|
index fb512f9..bc4a4b6 100644
|
|
--- a/src/regexp_nfa.c
|
|
+++ b/src/regexp_nfa.c
|
|
@@ -5455,7 +5455,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 19ff882..6d0ce59 100644
|
|
--- a/src/testdir/test_regexp_utf8.vim
|
|
+++ b/src/testdir/test_regexp_utf8.vim
|
|
@@ -215,3 +215,11 @@ func Test_optmatch_toolong()
|
|
set re=0
|
|
endfunc
|
|
|
|
+func Test_match_invalid_byte()
|
|
+ call writefile(0z630a.765d30aa0a.2e0a.790a.4030, 'Xinvalid')
|
|
+ new
|
|
+ source Xinvalid
|
|
+ bwipe!
|
|
+ call delete('Xinvalid')
|
|
+endfunc
|
|
+
|
|
--
|
|
1.8.3.1
|
|
|