patch 9.1.0399: block_editing errors out when using del

Problem:  block_editing errors out when using del
          (@Jamarley)
Solution: Change ins_len from size_t to int and
          properly check that it doesn't become negative

There is a check in os.c that verifies that `ins_len` does not become
negative:
```
if (pre_textlen >= 0 && (ins_len = len - pre_textlen - offset) > 0)
```
However this only works, if ins_len can actually become negative and
unfortunately, ins_len has been declared as `size_t` so instead of
becoming negative it will wrap around and be very large.

So let's define it as integer, after which the condition above
properly catches this condition.

fixes: #14734
closes: #14735

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/ops.c b/src/ops.c
index e3e782756eac3a71a73b2b67f67966c6e837d6fb..cdc30806ce60c1b3b3f93ee83a29f890107b4c50 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -1608,7 +1608,7 @@ op_insert(oparg_T *oap, long count1)
 
     if (oap->block_mode)
     {
-       size_t                  ins_len;
+       int                     ins_len;
        char_u                  *firstline, *ins_text;
        struct block_def        bd2;
        int                     did_indent = FALSE;

diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
index 9b8eed40e7066eb8d9886b6c1fb7aec6903669a9..b3049281b9b8c10171a55ece175554bc992a04fc 100644 (file)
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -2031,4 +2031,12 @@ func Test_getregion_maxcol()
   bwipe!
 endfunc
 
+func Test_visual_block_cursor_delete()
+  new
+  call setline(1, 'ab')
+  exe ":norm! $\<c-v>hI\<Del>\<ESC>"
+  call assert_equal(['b'], getline(1, 1))
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index ba03c1a506fa061a64a6fa4a54303d8b9aac2246..06f0c627601ff5f7dc0dddf2df0a314c741b9a2c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    399,
 /**/
     398,
 /**/