Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
patch 9.0.1247: divide by zero with 'smoothscroll' set and a narrow w…
…indow

Problem:    Divide by zero with 'smoothscroll' set and a narrow window.
Solution:   Bail out when the window is too narrow.
  • Loading branch information
brammool committed Jan 26, 2023
1 parent 142ed77 commit 870219c
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/move.c
Expand Up @@ -1933,6 +1933,9 @@ adjust_skipcol(void)
return;

int width1 = curwin->w_width - curwin_col_off();
if (width1 <= 0)
return; // no text will be displayed

int width2 = width1 + curwin_col_off2();
long so = get_scrolloff_value();
int scrolloff_cols = so == 0 ? 0 : width1 + (so - 1) * width2;
Expand Down
6 changes: 6 additions & 0 deletions src/testdir/dumps/Test_smoothscroll_zero_1.dump
@@ -0,0 +1,6 @@
> +0&#ffffff0@59
@60
@60
@60
@60
@60
6 changes: 6 additions & 0 deletions src/testdir/dumps/Test_smoothscroll_zero_2.dump
@@ -0,0 +1,6 @@
|:+0&#ffffff0|s|i|l| |n|o|r|m| |^|W|^|N| @45
> @59
@60
@60
@60
@60
27 changes: 27 additions & 0 deletions src/testdir/test_scroll_opt.vim
Expand Up @@ -560,5 +560,32 @@ func Test_smoothscroll_mouse_pos()
let &ttymouse = save_ttymouse
endfunc

" this was dividing by zero
func Test_smoothscrol_zero_width()
CheckScreendump

let lines =<< trim END
winsize 0 0
vsplit
vsplit
vsplit
vsplit
vsplit
sil norm H
set wrap
set smoothscroll
set number
END
call writefile(lines, 'XSmoothScrollZero', 'D')
let buf = RunVimInTerminal('-u NONE -i NONE -n -m -X -Z -e -s -S XSmoothScrollZero', #{rows: 6, cols: 60, wait_for_ruler: 0})
call TermWait(buf, 3000)
call VerifyScreenDump(buf, 'Test_smoothscroll_zero_1', {})

call term_sendkeys(buf, ":sil norm \<C-V>\<C-W>\<C-V>\<C-N>\<CR>")
call VerifyScreenDump(buf, 'Test_smoothscroll_zero_2', {})

call StopVimInTerminal(buf)
endfunc


" vim: shiftwidth=2 sts=2 expandtab
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1247,
/**/
1246,
/**/
Expand Down

0 comments on commit 870219c

Please sign in to comment.