1
0
forked from aniani/vim

patch 9.1.0121: Infinite loop or signed overflow with 'smoothscroll'

Problem:  infinite loop in win_update with 'smoothscroll' set when
          window width is equal to textoff, or signed integer overflow
          if smaller.
Solution: don't revalidate wp->w_skipcol in that case, as no buffer text
          is being shown. (Sean Dewar)

Don't instead reset w_skipcol; that would lose the scroll position
within the line, which may be undesirable if the window is made wider
later.

Also include changes from the splitmove PR #14042 that I (in my infinite
Git wisdom) forgot to commit. This includes a change to
Test_window_split_no_room to ensure it doesn't fail for some screen
sizes.

Move Test_smoothscroll_in_zero_width_window to test_scroll_opt.vim, as
that file feels more appropriate.

closes: #14068

Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Sean Dewar
2024-02-21 19:40:44 +01:00
committed by Christian Brabandt
parent 3f905ab3c4
commit 02fcae02a9
6 changed files with 53 additions and 22 deletions

View File

@@ -960,4 +960,42 @@ func Test_smoothscroll_insert_bottom()
call StopVimInTerminal(buf)
endfunc
func Test_smoothscroll_in_zero_width_window()
set cpo+=n number smoothscroll
set winwidth=99999 winminwidth=0
vsplit
call assert_equal(0, winwidth(winnr('#')))
call win_execute(win_getid(winnr('#')), "norm! \<C-Y>")
only!
set winwidth& winminwidth&
set cpo-=n nonumber nosmoothscroll
endfunc
func Test_smoothscroll_textoff_small_winwidth()
set smoothscroll number
call setline(1, 'llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch')
vsplit
let textoff = getwininfo(win_getid())[0].textoff
execute 'vertical resize' textoff + 1
redraw
call assert_equal(0, winsaveview().skipcol)
execute "normal! 0\<C-E>"
redraw
call assert_equal(1, winsaveview().skipcol)
execute 'vertical resize' textoff - 1
" This caused a signed integer overflow.
redraw
call assert_equal(1, winsaveview().skipcol)
execute 'vertical resize' textoff
" This caused an infinite loop.
redraw
call assert_equal(1, winsaveview().skipcol)
%bw!
set smoothscroll& number&
endfunc
" vim: shiftwidth=2 sts=2 expandtab