patch 8.2.1939: invalid memory access in Ex mode with global command
Problem: Invalid memory access in Ex mode with global command.
Solution: Make sure the cursor is on a valid line. (closes #7238)
diff --git a/src/move.c b/src/move.c
index 20a34e8..cd0af3e 100644
--- a/src/move.c
+++ b/src/move.c
@@ -196,6 +196,7 @@
// the cursor line.
if (!screen_valid(TRUE) || curwin->w_height == 0)
{
+ check_cursor_lnum();
curwin->w_topline = curwin->w_cursor.lnum;
curwin->w_botline = curwin->w_topline;
curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim
index 32c6544..c9ec20e 100644
--- a/src/testdir/test_ex_mode.vim
+++ b/src/testdir/test_ex_mode.vim
@@ -1,6 +1,7 @@
" Test editing line in Ex mode (see :help Q and :help gQ).
source check.vim
+source shared.vim
" Helper function to test editing line in Q Ex mode
func Ex_Q(cmd)
@@ -179,4 +180,28 @@
quit
endfunc
+func Test_ex_mode_with_global()
+ CheckFeature timers
+
+ " This will get stuck in Normal mode after the failed "J", use a timer to
+ " get going again.
+ let lines =<< trim END
+ call ch_logfile('logfile', 'w')
+ pedit
+ func FeedQ(id)
+ call feedkeys('Q', 't')
+ endfunc
+ call timer_start(10, 'FeedQ')
+ g/^/vi|HJ
+ call writefile(['done'], 'Xdidexmode')
+ qall!
+ END
+ call writefile(lines, 'Xexmodescript')
+ call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript'))
+ call assert_equal(['done'], readfile('Xdidexmode'))
+
+ call delete('Xdidexmode')
+ call delete('Xexmodescript')
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 3cba214..b4ef5a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1939,
+/**/
1938,
/**/
1937,