patch 9.1.0399: block_editing errors out when using del
Commit:
https://github.com/vim/vim/commit/d5c8c0920e1eee9ff7a9fa5168d8e85c01670630
Author: Christian Brabandt <c...@256bit.org>
Date: Wed May 8 22:17:19 2024 +0200
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 <c...@256bit.org>
diff --git a/src/ops.c b/src/ops.c
index e3e782756..cdc30806c 100644
--- 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 9b8eed40e..b3049281b 100644
--- 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 ba03c1a50..06f0c6276 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1s4nvP-006izw-GQ%40256bit.org.
