Mercurial > vim

changeset 23402:65718283239b v8.2.2244

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2244: crash when making the window width negative Commit: https://github.com/vim/vim/commit/89015a675990bd7d70e041c5d890edb803b5c6b7 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Dec 29 12:46:51 2020 +0100 patch 8.2.2244: crash when making the window width negative Problem: Crash when making the window width of the not-current window negative. Solution: Make sure the window width is not negative. (closes #7568)
author Bram Moolenaar <Bram@vim.org>
date Tue, 29 Dec 2020 13:00:35 +0100
parents f74a8d305e1e
children 370b7b1726a3
files src/testdir/test_window_cmd.vim src/version.c src/window.c
diffstat 3 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_window_cmd.vim
+++ b/src/testdir/test_window_cmd.vim
@@ -1148,6 +1148,14 @@ func Test_window_resize()
   exe other_winnr .. 'resize +1'
   call assert_equal(12, winheight(other_winnr))
   call assert_equal(&lines - 10 - 3 -2, winheight(0))
+  close
+
+  vsplit
+  wincmd l
+  let other_winnr = winnr('h')
+  call assert_notequal(winnr(), other_winnr)
+  exe 'vert ' .. other_winnr .. 'resize -100'
+  call assert_equal(0, winwidth(other_winnr))
 
   %bwipe!
 endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2244,
+/**/
     2243,
 /**/
     2242,
--- a/src/window.c
+++ b/src/window.c
@@ -5687,6 +5687,8 @@ win_setwidth_win(int width, win_T *wp)
 	if (width == 0)
 	    width = 1;
     }
+    else if (width < 0)
+	width = 0;
 
     frame_setwidth(wp->w_frame, width + wp->w_vsep_width);