Mercurial > vim
changeset 31829:2a590b4a3fba v9.0.1247
patch 9.0.1247: divide by zero with 'smoothscroll' set and a narrow window
Commit: https://github.com/vim/vim/commit/870219c58c0804bdc55419b2e455c06ac715a835
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 26 14:14:43 2023 +0000
patch 9.0.1247: divide by zero with 'smoothscroll' set and a narrow window
Problem: Divide by zero with 'smoothscroll' set and a narrow window.
Solution: Bail out when the window is too narrow.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 26 Jan 2023 15:15:06 +0100 |
| parents | 8680fdc452de |
| children | 61ec954c0adf |
| files | src/move.c src/testdir/dumps/Test_smoothscroll_zero_1.dump src/testdir/dumps/Test_smoothscroll_zero_2.dump src/testdir/test_scroll_opt.vim src/version.c |
| diffstat | 5 files changed, 44 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/move.c +++ b/src/move.c @@ -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;
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_smoothscroll_zero_1.dump @@ -0,0 +1,6 @@ +> +0&#ffffff0@59 +@60 +@60 +@60 +@60 +@60
new file mode 100644 --- /dev/null +++ b/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
--- a/src/testdir/test_scroll_opt.vim +++ b/src/testdir/test_scroll_opt.vim @@ -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