changeset 19732:e292acf16e26 v8.2.0422

patch 8.2.0422: crash when passing popup window to win_splitmove() Commit: https://github.com/vim/vim/commit/0f1563ffee4397f5b379517c41b7c9a977fd2e22 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Mar 20 21:15:51 2020 +0100 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 https://github.com/vim/vim/issues/5816)
author Bram Moolenaar <Bram@vim.org>
date Fri, 20 Mar 2020 21:30:03 +0100
parents 02a94f138083
children 5a056e3b60d9
files src/evalwindow.c src/testdir/test_popupwin.vim src/version.c
diffstat 3 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -810,7 +810,8 @@ f_win_splitmove(typval_T *argvars, typva
     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_popup(wp) || win_valid_popup(targetwin))
     {
         emsg(_(e_invalwindow));
 	rettv->vval.v_number = -1;
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3307,4 +3307,16 @@ func Test_popupwin_atcursor_far_right()
   set signcolumn&
 endfunc
 
+func Test_popupwin_splitmove()
+  vsplit
+  let win2 = win_getid()
+  let popup_winid = popup_dialog('hello', {})
+  call assert_fails('call win_splitmove(popup_winid, win2)', 'E957:')
+  call assert_fails('call win_splitmove(win2, popup_winid)', 'E957:')
+
+  call popup_clear()
+  bwipe
+endfunc
+
+
 " vim: shiftwidth=2 sts=2
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    422,
+/**/
     421,
 /**/
     420,