forked from aniani/vim
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)
This commit is contained in:
@@ -196,6 +196,7 @@ update_topline(void)
|
|||||||
// the cursor line.
|
// the cursor line.
|
||||||
if (!screen_valid(TRUE) || curwin->w_height == 0)
|
if (!screen_valid(TRUE) || curwin->w_height == 0)
|
||||||
{
|
{
|
||||||
|
check_cursor_lnum();
|
||||||
curwin->w_topline = curwin->w_cursor.lnum;
|
curwin->w_topline = curwin->w_cursor.lnum;
|
||||||
curwin->w_botline = curwin->w_topline;
|
curwin->w_botline = curwin->w_topline;
|
||||||
curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
|
curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
" Test editing line in Ex mode (see :help Q and :help gQ).
|
" Test editing line in Ex mode (see :help Q and :help gQ).
|
||||||
|
|
||||||
source check.vim
|
source check.vim
|
||||||
|
source shared.vim
|
||||||
|
|
||||||
" Helper function to test editing line in Q Ex mode
|
" Helper function to test editing line in Q Ex mode
|
||||||
func Ex_Q(cmd)
|
func Ex_Q(cmd)
|
||||||
@@ -179,4 +180,28 @@ func Test_ex_mode_errors()
|
|||||||
quit
|
quit
|
||||||
endfunc
|
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
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1939,
|
||||||
/**/
|
/**/
|
||||||
1938,
|
1938,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user