diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-01-26 21:33:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-26 21:33:53 +0100 |
| commit | 17e2938b100070d91bd956c8734760ca16f6d3f2 (patch) | |
| tree | 8c031c6f12c3b30bc18ea6dc62b41b2c281e0c69 /src/nvim/normal.c | |
| parent | 20482a2b83b9ea56ce226239ebb6c0fe7819c6f1 (diff) | |
| parent | dda1c8edda86a50d802f777e5ba2379f7ccd6ae8 (diff) | |
| download | rneovim-17e2938b100070d91bd956c8734760ca16f6d3f2.tar.gz rneovim-17e2938b100070d91bd956c8734760ca16f6d3f2.tar.bz2 rneovim-17e2938b100070d91bd956c8734760ca16f6d3f2.zip | |
Merge pull request #17132 from zeertzjq/vim-8.2.3611
vim-patch:8.2.{3494,3611,3613}: two Visual mode crash fixes
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index c3b7e81d17..63311160a7 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -4472,8 +4472,13 @@ bool get_visual_text(cmdarg_T *cap, char_u **pp, size_t *lenp) *pp = ml_get_pos(&VIsual); *lenp = (size_t)curwin->w_cursor.col - (size_t)VIsual.col + 1; } - // Correct the length to include the whole last character. - *lenp += (size_t)(utfc_ptr2len(*pp + (*lenp - 1)) - 1); + if (**pp == NUL) { + *lenp = 0; + } + if (*lenp > 0) { + // Correct the length to include all bytes of the last character. + *lenp += (size_t)(utfc_ptr2len(*pp + (*lenp - 1)) - 1); + } } reset_VIsual_and_resel(); return true; @@ -5963,11 +5968,8 @@ static void nv_visual(cmdarg_T *cap) * was only one -- webb */ if (resel_VIsual_mode != 'v' || resel_VIsual_line_count > 1) { - curwin->w_cursor.lnum += - resel_VIsual_line_count * cap->count0 - 1; - if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) { - curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; - } + curwin->w_cursor.lnum += resel_VIsual_line_count * cap->count0 - 1; + check_cursor(); } VIsual_mode = resel_VIsual_mode; if (VIsual_mode == 'v') { |