From cbf57fa353e54e01ae405565caddf3725a2814ba Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 26 May 2022 07:20:39 +0800
Subject: vim-patch:8.2.5016: access before start of text with a put command
 (#18742)

Problem:    Access before start of text with a put command.
Solution:   Check the length is more than zero.
https://github.com/vim/vim/commit/2a585c85013be22f59f184d49612074fd9b115d7
---
 src/nvim/ops.c                |  7 +++++--
 src/nvim/testdir/test_put.vim | 12 ++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 83e2a85112..6e6f478166 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -3696,8 +3696,11 @@ error:
       len = STRLEN(y_array[y_size - 1]);
       col = (colnr_T)len - lendiff;
       if (col > 1) {
-        curbuf->b_op_end.col = col - 1 - utf_head_off(y_array[y_size - 1],
-                                                      y_array[y_size - 1] + len - 1);
+        curbuf->b_op_end.col = col - 1;
+        if (len > 0) {
+          curbuf->b_op_end.col -= utf_head_off(y_array[y_size - 1],
+                                               y_array[y_size - 1] + len - 1);
+        }
       } else {
         curbuf->b_op_end.col = 0;
       }
diff --git a/src/nvim/testdir/test_put.vim b/src/nvim/testdir/test_put.vim
index 65232175c6..ffdaa81e0b 100644
--- a/src/nvim/testdir/test_put.vim
+++ b/src/nvim/testdir/test_put.vim
@@ -203,3 +203,15 @@ func Test_multibyte_op_end_mark()
   call assert_equal([0, 2, 7, 0], getpos("']"))
   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
-- 
cgit