patch 9.0.0820: memory leak with empty shell command

Problem:    Memory leak with empty shell command.
Solution:   Free the empty string.

diff --git a/src/errors.h b/src/errors.h
index 7aeca75aded65ace726f6fc155fd05e06b48ef39..d3bca1a329139829528d998462ca9a1e210968d3 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -3330,4 +3330,6 @@ EXTERN char e_loop_nesting_too_deep[]
        INIT(= N_("E1306: Loop nesting too deep"));
 EXTERN char e_argument_nr_trying_to_modify_const_str[]
        INIT(= N_("E1307: Argument %d: Trying to modify a const %s"));
+EXTERN char e_cannot_resize_window_in_another_tab_page[]
+       INIT(= N_("E1308: Cannot resize a window in another tab page"));
 #endif

diff --git a/src/evalwindow.c b/src/evalwindow.c
index 3d3301f65c93b2762c445e7b27b59f31602a5417..98c7ff3084808b6e5aec80a6dd12a7f6ee72b4cc 100644 (file)
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -914,6 +914,11 @@ f_win_move_statusline(typval_T *argvars, typval_T *rettv)
     wp = find_win_by_nr_or_id(&argvars[0]);
     if (wp == NULL || win_valid_popup(wp))
        return;
+    if (!win_valid(wp))
+    {
+       emsg(_(e_cannot_resize_window_in_another_tab_page));
+       return;
+    }
 
     offset = (int)tv_get_number(&argvars[1]);
     win_drag_status_line(wp, offset);

diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
index 6368889df5363da48448dab5c832e78fd1d0b4ec..8a7191340881d29ede01fb9a7699d72354a132cc 100644 (file)
--- a/src/testdir/test_window_cmd.vim
+++ b/src/testdir/test_window_cmd.vim
@@ -1545,23 +1545,33 @@ func Test_win_move_statusline()
     call assert_true(id->win_move_statusline(-offset))
     call assert_equal(h, winheight(id))
   endfor
+
   " check that win_move_statusline doesn't error with offsets beyond moving
   " possibility
   call assert_true(win_move_statusline(id, 5000))
   call assert_true(winheight(id) > h)
   call assert_true(win_move_statusline(id, -5000))
   call assert_true(winheight(id) < h)
+
   " check that win_move_statusline returns false for an invalid window
   wincmd =
   let h = winheight(0)
   call assert_false(win_move_statusline(-1, 1))
   call assert_equal(h, winheight(0))
+
   " check that win_move_statusline returns false for a popup window
   let id = popup_create(['hello', 'world'], {})
   let h = winheight(id)
   call assert_false(win_move_statusline(id, 1))
   call assert_equal(h, winheight(id))
   call popup_close(id)
+
+  " check that using another tabpage fails without crash
+  let id = win_getid()
+  tabnew
+  call assert_fails('call win_move_statusline(id, -1)', 'E1308:')
+  tabclose
+
   %bwipe!
 endfunc
 

diff --git a/src/version.c b/src/version.c
index 2d2ae6aaee04f784a2c061ab4bcdd8402bd3ea12..58f17e1e2625f5318a62e1d6c6918b6a4c9b8f90 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    821,
 /**/
     820,
 /**/