patch 9.1.1048: crash after scrolling and pasting in silent Ex mode
Commit:
https://github.com/vim/vim/commit/df098fedbc2c481e91ea7e6207dab90359a92cc3
Author: zeertzjq <zeert...@outlook.com>
Date: Wed Jan 22 22:27:30 2025 +0100
patch 9.1.1048: crash after scrolling and pasting in silent Ex mode
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: #16506
Signed-off-by: zeertzjq <zeert...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/move.c b/src/move.c
index f2780e584..ed252d9db 100644
--- a/src/move.c
+++ b/src/move.c
@@ -3285,8 +3285,11 @@ pagescroll(int dir, long count, int half)
{
// Place cursor at top or bottom of window.
validate_botline();
- curwin->w_cursor.lnum = (dir == FORWARD ? curwin->w_topline
+ 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);
}
}
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 6dd3fac0c..75a3028b6 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1342,6 +1342,22 @@ func Test_scroll_in_ex_mode()
call delete('Xdone')
endfunc
+func Test_scroll_and_paste_in_ex_mode()
+ " 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
+
" Test for the 'sidescroll' option
func Test_sidescroll_opt()
new
@@ -4293,4 +4309,5 @@ func Test_normal_go()
bwipe!
endfunc
+
" vim: shiftwidth=2 sts=2 expandtab nofoldenable
diff --git a/src/version.c b/src/version.c
index c9f88e93d..67f168903 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1048,
/**/
1047,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1taiIe-00CNSP-RL%40256bit.org.
