diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-10-31 12:24:12 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-31 12:24:12 +0000 |
| commit | 86e6717ace4f5e00eaeb84b59e3fc92bca548155 (patch) | |
| tree | 58860abae059255fe3cc2c6966933c9f7975acfa | |
| parent | 03d6e6f42b0deeb02d52c8a48c14abe431370c1c (diff) | |
| download | vim-git-86e6717ace4f5e00eaeb84b59e3fc92bca548155.tar.gz | |
patch 9.0.0820: memory leak with empty shell commandv9.0.0821
Problem: Memory leak with empty shell command.
Solution: Free the empty string.
| -rw-r--r-- | src/errors.h | 2 | ||||
| -rw-r--r-- | src/evalwindow.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_window_cmd.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 19 insertions, 0 deletions
diff --git a/src/errors.h b/src/errors.h index 7aeca75ad..d3bca1a32 100644 --- 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 3d3301f65..98c7ff308 100644 --- 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 6368889df..8a7191340 100644 --- 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 2d2ae6aae..58f17e1e2 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 821, +/**/ 820, /**/ 819, |