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>
This commit is contained in:
@ -1608,7 +1608,7 @@ op_insert(oparg_T *oap, long count1)
|
|||||||
|
|
||||||
if (oap->block_mode)
|
if (oap->block_mode)
|
||||||
{
|
{
|
||||||
size_t ins_len;
|
int ins_len;
|
||||||
char_u *firstline, *ins_text;
|
char_u *firstline, *ins_text;
|
||||||
struct block_def bd2;
|
struct block_def bd2;
|
||||||
int did_indent = FALSE;
|
int did_indent = FALSE;
|
||||||
|
|||||||
@ -2031,4 +2031,12 @@ func Test_getregion_maxcol()
|
|||||||
bwipe!
|
bwipe!
|
||||||
endfunc
|
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
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
|||||||
@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
399,
|
||||||
/**/
|
/**/
|
||||||
398,
|
398,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user