Mercurial > vim
changeset 26061:787c8061c747 v8.2.3564
patch 8.2.3564: invalid memory access when scrolling without valid screen
Commit: https://github.com/vim/vim/commit/777e7c21b7627be80961848ac560cb0a9978ff43
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Oct 25 17:07:04 2021 +0100
patch 8.2.3564: invalid memory access when scrolling without valid screen
Problem: Invalid memory access when scrolling without a valid screen.
Solution: Do not set VALID_BOTLINE in w_valid.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 25 Oct 2021 18:15:03 +0200 |
| parents | b392baba0478 |
| children | b4ffbed12ddd |
| files | src/move.c src/testdir/test_normal.vim src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/move.c +++ b/src/move.c @@ -199,7 +199,6 @@ update_topline(void) check_cursor_lnum(); curwin->w_topline = curwin->w_cursor.lnum; curwin->w_botline = curwin->w_topline; - curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP; curwin->w_scbind_pos = 1; return; }
--- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -34,14 +34,14 @@ func CountSpaces(type, ...) else silent exe "normal! `[v`]y" endif - let g:a=strlen(substitute(@@, '[^ ]', '', 'g')) + let g:a = strlen(substitute(@@, '[^ ]', '', 'g')) let &selection = sel_save let @@ = reg_save endfunc func OpfuncDummy(type, ...) " for testing operatorfunc - let g:opt=&linebreak + let g:opt = &linebreak if a:0 " Invoked from Visual mode, use gv command. silent exe "normal! gvy" @@ -52,7 +52,7 @@ func OpfuncDummy(type, ...) endif " Create a new dummy window new - let g:bufnr=bufnr('%') + let g:bufnr = bufnr('%') endfunc func Test_normal00_optrans() @@ -987,6 +987,22 @@ func Test_vert_scroll_cmds() close! endfunc +func Test_scroll_in_ex_mode() + " This was using invalid memory because w_botline was invalid. + let lines =<< trim END + diffsplit + norm os00( + call writefile(['done'], 'Xdone') + qa! + END + call writefile(lines, 'Xscript') + 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 + " Test for the 'sidescroll' option func Test_sidescroll_opt() new