GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-15 16:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1048: crash after scrolling and pasting in silent Ex mode (#32168)

Browse Source 
Problem:  Crash after scrolling and pasting in silent Ex mode.
          (fizz-is-on-the-way)
Solution: Don't move cursor to line 0 when scrolling.
          (zeertzjq)

closes: vim/vim#16506

df098fedbc
(cherry picked from commit a9c12d4c29)
This commit is contained in:
zeertzjq
2025-01-23 08:12:10 +08:00
committed by github-actions[bot]
parent 3a50639331
commit 938a600847
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/move.c
View File

@ -2523,7 +2523,10 @@ int pagescroll(Direction dir, int count, bool half)
if (!nochange) {
// Place cursor at top or bottom of window.
validate_botline(curwin);
curwin->w_cursor.lnum = (dir == FORWARD ? curwin->w_topline : curwin->w_botline - 1);
linenr_T lnum = (dir == FORWARD ? curwin->w_topline : curwin->w_botline - 1);
// In silent Ex mode the value of w_botline - 1 may be 0,
// but cursor lnum needs to be at least 1.
curwin->w_cursor.lnum = MAX(lnum, 1);
}
}

21
test/old/testdir/test_normal.vim
View File

@ -1338,11 +1338,27 @@ func Test_scroll_in_ex_mode()
call writefile(['done'], 'Xdone')
qa!
END
call writefile(lines, 'Xscript')
call writefile(lines, 'Xscript', 'D')
call assert_equal(1, RunVim([], [], '--clean -X -Z -e -s -S Xscript'))
call assert_equal(['done'], readfile('Xdone'))
call delete('Xscript')
call delete('Xdone')
endfunc
func Test_scroll_and_paste_in_ex_mode()
throw 'Skipped: does not work when Nvim is run from :!'
" This used to crash because of moving cursor to line 0.
let lines =<< trim END
v/foo/vi|YY9PYQ
v/bar/vi|YY9PYQ
v/bar/exe line('.') == 1 ? "vi|Y\<C-B>9PYQ" : "vi|YQ"
call writefile(['done'], 'Xdone')
qa!
END
call writefile(lines, 'Xscript', 'D')
call assert_equal(1, RunVim([], [], '-u NONE -i NONE -n -X -Z -e -s -S Xscript'))
call assert_equal(['done'], readfile('Xdone'))
call delete('Xdone')
endfunc
@ -4304,4 +4320,5 @@ func Test_normal_go()
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab nofoldenable