Mercurial > vim
changeset 30972:62a42d860d87 v9.0.0821
patch 9.0.0820: memory leak with empty shell command
Commit: https://github.com/vim/vim/commit/86e6717ace4f5e00eaeb84b59e3fc92bca548155
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Oct 31 12:24:12 2022 +0000
patch 9.0.0820: memory leak with empty shell command
Problem: Memory leak with empty shell command.
Solution: Free the empty string.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 02 Nov 2022 11:18:51 +0100 |
| parents | 435e8155d5cb |
| children | 4d6024463de7 |
| files | src/errors.h src/evalwindow.c src/testdir/test_window_cmd.vim src/version.c |
| diffstat | 4 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -914,6 +914,11 @@ f_win_move_statusline(typval_T *argvars, 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);
--- 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