|
 |
da4393 |
From 65b605665997fad54ef39a93199e305af2fe4d7f Mon Sep 17 00:00:00 2001
|
|
|
da4393 |
From: Bram Moolenaar <Bram@vim.org>
|
|
|
da4393 |
Date: Tue, 7 Sep 2021 19:26:53 +0200
|
|
|
da4393 |
Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8
|
|
|
da4393 |
character
|
|
|
da4393 |
|
|
|
da4393 |
Problem: Reading beyond end of line with invalid utf-8 character.
|
|
|
da4393 |
Solution: Check for NUL when advancing.
|
|
|
da4393 |
---
|
|
|
da4393 |
src/regexp_nfa.c | 3 ++-
|
|
|
da4393 |
src/testdir/test_regexp_utf8.vim | 8 ++++++++
|
|
|
da4393 |
src/version.c | 2 ++
|
|
|
da4393 |
3 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
da4393 |
|
|
|
da4393 |
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
|
|
|
da4393 |
index 9757d7c47..c7db98187 100644
|
|
|
da4393 |
--- a/src/regexp_nfa.c
|
|
|
da4393 |
+++ b/src/regexp_nfa.c
|
|
|
da4393 |
@@ -5664,7 +5664,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text)
|
|
|
da4393 |
match = FALSE;
|
|
|
da4393 |
break;
|
|
|
da4393 |
}
|
|
|
da4393 |
- len2 += MB_CHAR2LEN(c2);
|
|
|
da4393 |
+ len2 += enc_utf8 ? utf_ptr2len(rex.line + col + len2)
|
|
|
da4393 |
+ : MB_CHAR2LEN(c2);
|
|
|
da4393 |
}
|
|
|
da4393 |
if (match
|
|
|
da4393 |
// check that no composing char follows
|
|
|
da4393 |
diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim
|
|
|
da4393 |
index 9f0ffb9aa..044aeffb6 100644
|
|
|
da4393 |
--- a/src/testdir/test_regexp_utf8.vim
|
|
|
da4393 |
+++ b/src/testdir/test_regexp_utf8.vim
|
|
|
da4393 |
@@ -558,4 +558,12 @@ func Test_match_char_class_upper()
|
|
|
da4393 |
bwipe!
|
|
|
da4393 |
endfunc
|
|
|
da4393 |
|
|
|
da4393 |
+func Test_match_invalid_byte()
|
|
|
da4393 |
+ call writefile(0z630a.765d30aa0a.2e0a.790a.4030, 'Xinvalid')
|
|
|
da4393 |
+ new
|
|
|
da4393 |
+ source Xinvalid
|
|
|
da4393 |
+ bwipe!
|
|
|
da4393 |
+ call delete('Xinvalid')
|
|
|
da4393 |
+endfunc
|
|
|
da4393 |
+
|
|
|
da4393 |
" vim: shiftwidth=2 sts=2 expandtab
|
|
|
da4393 |
--
|
|
|
da4393 |
2.31.1
|
|
|
da4393 |
|