Mercurial > vim

changeset 23064:89c324e327c0 v8.2.2078

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2078: illegal memory access when using :print on invalid text Commit: https://github.com/vim/vim/commit/1cbfc9914db1cb06aaa092fa42eb7a2fc3dc7ad7 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Dec 2 12:37:37 2020 +0100 patch 8.2.2078: illegal memory access when using :print on invalid text Problem: Illegal memory access when using :print on invalid text. (Dhiraj Mishra) Solution: Check for more composing characters than supported. (closes #7399)
author Bram Moolenaar <Bram@vim.org>
date Wed, 02 Dec 2020 12:45:03 +0100
parents 909927c2d5ac
children 916779898006
files src/message.c src/testdir/test_utf8.vim src/version.c
diffstat 3 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/message.c
+++ b/src/message.c
@@ -1859,7 +1859,11 @@ msg_prt_line(char_u *s, int list)
 	else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1)
 	{
 	    col += (*mb_ptr2cells)(s);
-	    if (lcs_nbsp != NUL && list
+	    if (l >= MB_MAXBYTES)
+	    {
+		STRCPY(buf, "¿");
+	    }
+	    else if (lcs_nbsp != NUL && list
 		    && (mb_ptr2char(s) == 160
 			|| mb_ptr2char(s) == 0x202f))
 	    {
--- a/src/testdir/test_utf8.vim
+++ b/src/testdir/test_utf8.vim
@@ -180,4 +180,13 @@ func Test_setcellwidths()
   call assert_fails('call setcellwidths([[0x33, 0x44, 2]])', 'E1114:')
 endfunc
 
+func Test_print_overlong()
+  " Text with more composing characters than MB_MAXBYTES.
+  new
+  call setline(1, 'axxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+  s/x/\=nr2char(1629)/g
+  print
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2078,
+/**/
     2077,
 /**/
     2076,