mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 13:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0483: illegal memory access when replacing in virtualedit mode (#20225)

Browse Source 
Problem:    Illegal memory access when replacing in virtualedit mode.
Solution:   Check for replacing NUL after Tab.
c249913edc

Cherry-pick Test_virtualedit_mouse() from patch 9.0.0177.
This commit is contained in:
zeertzjq
2022-09-17 10:20:06 +08:00
committed by GitHub
parent 26b54d5c16
commit 72e1041429
2 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/ops.c
View File

@@ -1961,6 +1961,8 @@ static int op_replace(oparg_T *oap, int c)
// TODO(bfredl): we could batch all the splicing // TODO(bfredl): we could batch all the splicing
// done on the same line, at least // done on the same line, at least
while (ltoreq(curwin->w_cursor, oap->end)) { while (ltoreq(curwin->w_cursor, oap->end)) {
bool done = false;
n = gchar_cursor(); n = gchar_cursor();
if (n != NUL) { if (n != NUL) {
int new_byte_len = utf_char2len(c); int new_byte_len = utf_char2len(c);
@@ -1973,6 +1975,7 @@ static int op_replace(oparg_T *oap, int c)
oap->end.col += new_byte_len - old_byte_len; oap->end.col += new_byte_len - old_byte_len;
} }
replace_character(c); replace_character(c);
done = true;
} else { } else {
if (n == TAB) { if (n == TAB) {
int end_vcol = 0; int end_vcol = 0;
@@ -1988,9 +1991,14 @@ static int op_replace(oparg_T *oap, int c)
getvpos(&oap->end, end_vcol); getvpos(&oap->end, end_vcol);
} }
} }
// with "coladd" set may move to just after a TAB
if (gchar_cursor() != NUL) {
pbyte(curwin->w_cursor, c); pbyte(curwin->w_cursor, c);
done = true;
} }
} else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) { }
}
if (!done && virtual_op && curwin->w_cursor.lnum == oap->end.lnum) {
int virtcols = oap->end.coladd; int virtcols = oap->end.coladd;
if (curwin->w_cursor.lnum == oap->start.lnum if (curwin->w_cursor.lnum == oap->start.lnum

49
src/nvim/testdir/test_virtualedit.vim
View File

@@ -481,4 +481,53 @@ func Test_global_local_virtualedit()
set virtualedit& set virtualedit&
endfunc endfunc
func Test_virtualedit_mouse()
let save_mouse = &mouse
set mouse=a
set virtualedit=all
new
call setline(1, ["text\tword"])
redraw
call Ntest_setmouse(1, 4)
call feedkeys("\<LeftMouse>", "xt")
call assert_equal([0, 1, 4, 0, 4], getcurpos())
call Ntest_setmouse(1, 5)
call feedkeys("\<LeftMouse>", "xt")
call assert_equal([0, 1, 5, 0, 5], getcurpos())
call Ntest_setmouse(1, 6)
call feedkeys("\<LeftMouse>", "xt")
call assert_equal([0, 1, 5, 1, 6], getcurpos())
call Ntest_setmouse(1, 7)
call feedkeys("\<LeftMouse>", "xt")
call assert_equal([0, 1, 5, 2, 7], getcurpos())
call Ntest_setmouse(1, 8)
call feedkeys("\<LeftMouse>", "xt")
call assert_equal([0, 1, 5, 3, 8], getcurpos())
call Ntest_setmouse(1, 9)
call feedkeys("\<LeftMouse>", "xt")
call assert_equal([0, 1, 6, 0, 9], getcurpos())
call Ntest_setmouse(1, 15)
call feedkeys("\<LeftMouse>", "xt")
call assert_equal([0, 1, 10, 2, 15], getcurpos())
bwipe!
let &mouse = save_mouse
set virtualedit&
endfunc
" this was replacing the NUL at the end of the line
func Test_virtualedit_replace_after_tab()
new
s/\v/ 0
set ve=all
let @" = ''
sil! norm vPvr0
call assert_equal("\t0", getline(1))
set ve&
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab