Mercurial > vim

diff src/regexp_nfa.c @ 25747:1c999a6e9d92 v8.2.3409

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1e6da8364a02
children 9835f424bef5
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