Mercurial > vim
changeset 19065:ef3633932b0c v8.2.0093
patch 8.2.0093: win_splitmove() can make Vim hang
Commit: https://github.com/vim/vim/commit/7b94e77132eabdf0e43abca57e2ffeb961545174
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 6 21:03:24 2020 +0100
patch 8.2.0093: win_splitmove() can make Vim hang
Problem: win_splitmove() can make Vim hang.
Solution: Check windows exists in the current tab page. (closes https://github.com/vim/vim/issues/5444)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 06 Jan 2020 21:15:06 +0100 |
parents | 76a2ab83e2c5 |
children | 2379273ec8a9 |
files | src/evalwindow.c src/testdir/test_window_cmd.vim src/version.c |
diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -808,7 +808,8 @@ f_win_splitmove(typval_T *argvars, typva wp = find_win_by_nr_or_id(&argvars[0]); targetwin = find_win_by_nr_or_id(&argvars[1]); - if (wp == NULL || targetwin == NULL || wp == targetwin) + if (wp == NULL || targetwin == NULL || wp == targetwin + || !win_valid(wp) || !win_valid(targetwin)) { emsg(_(e_invalwindow)); rettv->vval.v_number = -1;
--- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -927,6 +927,10 @@ func Test_win_splitmove() call assert_fails('call win_splitmove(winnr(), 123)', 'E957:') call assert_fails('call win_splitmove(123, winnr())', 'E957:') call assert_fails('call win_splitmove(winnr(), winnr())', 'E957:') + + tabnew + call assert_fails('call win_splitmove(1, win_getid(1, 1))', 'E957:') + tabclose endfunc " vim: shiftwidth=2 sts=2 expandtab