diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-01 21:56:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-01 21:56:40 +0100 |
| commit | 3b6d57f2ce87dc5a4b1a50e1b0fd2aeaf72faae2 (patch) | |
| tree | 7017780a40d43304cabf62100b0c52df6cea6977 | |
| parent | a46765a79745ff27b4a44659fb8389519c961977 (diff) | |
| download | vim-git-3b6d57f2ce87dc5a4b1a50e1b0fd2aeaf72faae2.tar.gz | |
patch 8.2.1939: invalid memory access in Ex mode with global commandv8.2.1939
Problem: Invalid memory access in Ex mode with global command.
Solution: Make sure the cursor is on a valid line. (closes #7238)
| -rw-r--r-- | src/move.c | 1 | ||||
| -rw-r--r-- | src/testdir/test_ex_mode.vim | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 28 insertions, 0 deletions
diff --git a/src/move.c b/src/move.c index 20a34e8e5..cd0af3e64 100644 --- a/src/move.c +++ b/src/move.c @@ -196,6 +196,7 @@ update_topline(void) // 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 32c65448f..c9ec20e54 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 @@ func Test_ex_mode_errors() 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 3cba21401..b4ef5a983 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1939, +/**/ 1938, /**/ 1937, |