Mercurial > vim
changeset 32090:327f8a3e0040 v9.0.1376
patch 9.0.1376: accessing invalid memory with put in Visual block mode
Commit: https://github.com/vim/vim/commit/1c73b65229c25e3c1fd8824ba958f7cc4d604f9c
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Mar 3 21:11:52 2023 +0000
patch 9.0.1376: accessing invalid memory with put in Visual block mode
Problem: Accessing invalid memory with put in Visual block mode.
Solution: Adjust the cursor column if needed.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 03 Mar 2023 22:15:03 +0100 |
| parents | 0e974e1aeb82 |
| children | 136482cd3234 |
| files | src/register.c src/testdir/test_put.vim src/version.c |
| diffstat | 3 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/register.c +++ b/src/register.c @@ -1928,7 +1928,7 @@ do_put( ptr += yanklen; // insert block's trailing spaces only if there's text behind - if ((j < count - 1 || !shortline) && spaces) + if ((j < count - 1 || !shortline) && spaces > 0) { vim_memset(ptr, ' ', (size_t)spaces); ptr += spaces; @@ -2284,6 +2284,15 @@ error: msgmore(nr_lines); curwin->w_set_curswant = TRUE; + // Make sure the cursor is not after the NUL. + int len = (int)STRLEN(ml_get_curline()); + if (curwin->w_cursor.col > len) + { + if (cur_ve_flags == VE_ALL) + curwin->w_cursor.coladd = curwin->w_cursor.col - len; + curwin->w_cursor.col = len; + } + end: if (cmdmod.cmod_flags & CMOD_LOCKMARKS) {
--- a/src/testdir/test_put.vim +++ b/src/testdir/test_put.vim @@ -231,5 +231,16 @@ func Test_put_visual_mode() set selection& endfunc +func Test_put_visual_block_mode() + enew + exe "norm 0R\<CR>\<C-C>V" + sil exe "norm \<C-V>c \<MiddleDrag>" + set ve=all + sil norm vz=p + + bwipe! + set ve= +endfunc + " vim: shiftwidth=2 sts=2 expandtab