diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-01-25 18:24:00 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-25 18:24:00 +0000 |
| commit | 8d02ce1ed75d008c34a5c9aaa51b67cbb9d33baa (patch) | |
| tree | b620fd43b0d5cc344278304738f6d9e6d67c3260 | |
| parent | 06b77229ca704d00c4f138ed0377556e54d5851f (diff) | |
| download | vim-git-8d02ce1ed75d008c34a5c9aaa51b67cbb9d33baa.tar.gz | |
patch 8.2.4217: illegal memory access when undo makes Visual area invalidv8.2.4217
Problem: Illegal memory access when undo makes Visual area invalid.
Solution: Correct the Visual area after undo.
| -rw-r--r-- | src/testdir/test_visual.vim | 15 | ||||
| -rw-r--r-- | src/undo.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 19 insertions, 0 deletions
diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim index 9b322fd21..b2beda08d 100644 --- a/src/testdir/test_visual.vim +++ b/src/testdir/test_visual.vim @@ -1339,5 +1339,20 @@ func Test_visual_ex_copy_line() bwipe! endfunc +" This was leaving the end of the Visual area beyond the end of a line. +" Set 'undolevels' to start a new undo block. +func Test_visual_undo_deletes_last_line() + new + call setline(1, ["aaa", "ccc", "dyd"]) + set undolevels=100 + exe "normal obbbbbbbbbxbb\<Esc>" + set undolevels=100 + /y + exe "normal ggvjfxO" + undo + normal gNU + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/undo.c b/src/undo.c index 4d186d453..636144aef 100644 --- a/src/undo.c +++ b/src/undo.c @@ -3029,6 +3029,8 @@ u_undo_end( } } #endif + if (VIsual_active) + check_pos(curbuf, &VIsual); smsg_attr_keep(0, _("%ld %s; %s #%ld %s"), u_oldcount < 0 ? -u_oldcount : u_oldcount, diff --git a/src/version.c b/src/version.c index f5f9a2ef9..6685b554f 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4217, +/**/ 4216, /**/ 4215, |