changeset 28988:e6f486df5cc9 v8.2.5016

patch 8.2.5016: access before start of text with a put command Commit: https://github.com/vim/vim/commit/2a585c85013be22f59f184d49612074fd9b115d7 Author: Bram Moolenaar <Bram@vim.org> Date: Wed May 25 15:15:38 2022 +0100 patch 8.2.5016: access before start of text with a put command Problem: Access before start of text with a put command. Solution: Check the length is more than zero.
author Bram Moolenaar <Bram@vim.org>
date Wed, 25 May 2022 16:30:02 +0200
parents ddbc9ec9466b
children 65b740512fbf
files src/register.c src/testdir/test_put.vim src/version.c
diffstat 3 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/register.c
+++ b/src/register.c
@@ -2219,9 +2219,12 @@ error:
 	    len = STRLEN(y_array[y_size - 1]);
 	    col = (colnr_T)len - lendiff;
 	    if (col > 1)
-		curbuf->b_op_end.col = col - 1
-				- mb_head_off(y_array[y_size - 1],
+	    {
+		curbuf->b_op_end.col = col - 1;
+		if (len > 0)
+		    curbuf->b_op_end.col -= mb_head_off(y_array[y_size - 1],
 						y_array[y_size - 1] + len - 1);
+	    }
 	    else
 		curbuf->b_op_end.col = 0;
 
--- a/src/testdir/test_put.vim
+++ b/src/testdir/test_put.vim
@@ -210,5 +210,14 @@ func Test_multibyte_op_end_mark()
   bwipe!
 endfunc
 
+" this was putting a mark before the start of a line
+func Test_put_empty_register()
+  new
+  norm yy
+  norm [Pi00ggv)s0
+  sil! norm [P
+  bwipe!
+endfunc
+
 
 " vim: shiftwidth=2 sts=2 expandtab
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5016,
+/**/
     5015,
 /**/
     5014,