aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/funcs.c
diff options
context:
space:
mode:
authorAndy K. Massimino <f8a663@normed.space>2021-03-18 22:40:18 -0400
committerAndy K. Massimino <f8a663@normed.space>2021-03-19 23:02:34 -0400
commit0cec2d39c995f8aaeac95edb0ce463c6fcd19645 (patch)
tree30815433392d7749d69eae39c7f96001822e63d3 /src/nvim/eval/funcs.c
parentb2ec77007081cf9c63f935115f69c718db248226 (diff)
downloadrneovim-0cec2d39c995f8aaeac95edb0ce463c6fcd19645.tar.gz
rneovim-0cec2d39c995f8aaeac95edb0ce463c6fcd19645.tar.bz2
rneovim-0cec2d39c995f8aaeac95edb0ce463c6fcd19645.zip
vim-patch:8.2.0422: crash when passing popup window to win_splitmove()
Problem: Crash when passing popup window to win_splitmove(). (john Devin) Solution: Disallow moving a popup window. (closes vim/vim#5816) https://github.com/vim/vim/commit/0f1563ffee4397f5b379517c41b7c9a977fd2e22 Add translated test for 8.2.0422 (popup->floating)
Diffstat (limited to 'src/nvim/eval/funcs.c')
-rw-r--r--src/nvim/eval/funcs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 7fb3ccd737..9edf5c8f7e 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -4032,7 +4032,8 @@ static void f_win_splitmove(typval_T *argvars, typval_T *rettv, FunPtr fptr)
targetwin = find_win_by_nr_or_id(&argvars[1]);
if (wp == NULL || targetwin == NULL || wp == targetwin
- || !win_valid(wp) || !win_valid(targetwin)) {
+ || !win_valid(wp) || !win_valid(targetwin)
+ || win_valid_floating(wp) || win_valid_floating(targetwin)) {
EMSG(_(e_invalwindow));
rettv->vval.v_number = -1;
return;