# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1631035804 -7200
# Node ID 1c999a6e9d9222a4666e7eeec9c7a51a3649a57d
# Parent  1757d3afd6cb9ad040609c8a3d395d044cf50e54
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.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
--- 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
diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim
--- 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
--- 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,