61 lines
1.6 KiB
Diff
61 lines
1.6 KiB
Diff
From dc5490e2cbc8c16022a23b449b48c1bd0083f366 Mon Sep 17 00:00:00 2001
|
|
From: Bram Moolenaar <Bram@vim.org>
|
|
Date: Tue, 25 Jan 2022 13:52:53 +0000
|
|
Subject: [PATCH] patch 8.2.4215: illegal memory access when copying lines in
|
|
Visual mode
|
|
|
|
Problem: Illegal memory access when copying lines in Visual mode.
|
|
Solution: Adjust the Visual position after copying lines.
|
|
---
|
|
src/ex_cmds.c | 2 ++
|
|
src/testdir/test_visual.vim | 13 +++++++++++--
|
|
2 files changed, 13 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
|
|
index fea6dfa..aa97b40 100644
|
|
--- a/src/ex_cmds.c
|
|
+++ b/src/ex_cmds.c
|
|
@@ -864,6 +864,8 @@ ex_copy(linenr_T line1, linenr_T line2, linenr_T n)
|
|
}
|
|
|
|
appended_lines_mark(n, count);
|
|
+ if (VIsual_active)
|
|
+ check_pos(curbuf, &VIsual);
|
|
|
|
msgmore((long)count);
|
|
}
|
|
diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
|
|
index 3ed927a..f82d75b 100644
|
|
--- a/src/testdir/test_visual.vim
|
|
+++ b/src/testdir/test_visual.vim
|
|
@@ -658,8 +658,6 @@ func Test_linewise_select_mode()
|
|
call append('$', ['a', 'b', 'c'])
|
|
exe "normal GkkgH\<Del>"
|
|
call assert_equal(['', 'b', 'c'], getline(1, '$'))
|
|
-
|
|
-
|
|
" linewise select mode: delete middle two lines
|
|
call deletebufline('', 1, '$')
|
|
call append('$', ['a', 'b', 'c'])
|
|
@@ -681,6 +679,17 @@ func Test_linewise_select_mode()
|
|
bwipe!
|
|
endfunc
|
|
|
|
+" this was leaving the end of the Visual area beyond the end of a line
|
|
+func Test_visual_ex_copy_line()
|
|
+ new
|
|
+ call setline(1, ["aaa", "bbbbbbbbbxbb"])
|
|
+ /x
|
|
+ exe "normal ggvjfxO"
|
|
+ t0
|
|
+ normal gNU
|
|
+ bwipe!
|
|
+endfunc
|
|
+
|
|
func Test_visual_mode_put()
|
|
new
|
|
|
|
--
|
|
2.27.0
|
|
|