commit dab17a0689a2f31f69f428975f84b0c3c7ba3030
author Bram Moolenaar <Bram@vim.org> Mon Dec 20 21:35:59 2021 +0000
committer Bram Moolenaar <Bram@vim.org> Mon Dec 20 21:35:59 2021 +0000
tree 6ab3b3865878fc6de89d4f2654d71b00c5fed833
parent 39713d3acbfb6673775158a0171c7389c07f25df

patch 8.2.3862: crash on exit with EXITFREE and using win_execute()

Problem:    Crash on exit with EXITFREE and using win_execute().
Solution:   Also save and restore tp_topframe. (issue #9374)

src/evalwindow.c

diff --git a/src/evalwindow.c b/src/evalwindow.c
index c8c1442..794d6aa 100644
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -1250,9 +1250,11 @@
 	{
 	    curtab->tp_firstwin = firstwin;
 	    curtab->tp_lastwin = lastwin;
+	    curtab->tp_topframe = topframe;
 	    curtab = tp;
 	    firstwin = curtab->tp_firstwin;
 	    lastwin = curtab->tp_lastwin;
+	    topframe = curtab->tp_topframe;
 	}
 	else
 	    goto_tabpage_tp(tp, FALSE, FALSE);
@@ -1294,9 +1296,11 @@
 	{
 	    curtab->tp_firstwin = firstwin;
 	    curtab->tp_lastwin = lastwin;
+	    curtab->tp_topframe = topframe;
 	    curtab = save_curtab;
 	    firstwin = curtab->tp_firstwin;
 	    lastwin = curtab->tp_lastwin;
+	    topframe = curtab->tp_topframe;
 	}
 	else
 	    goto_tabpage_tp(save_curtab, FALSE, FALSE);

src/testdir/test_execute_func.vim

diff --git a/src/testdir/test_execute_func.vim b/src/testdir/test_execute_func.vim
index 06049c2..9146504 100644
--- a/src/testdir/test_execute_func.vim
+++ b/src/testdir/test_execute_func.vim
@@ -3,6 +3,7 @@
 source view_util.vim
 source check.vim
 source vim9.vim
+source term_util.vim
 
 func NestedEval()
   let nested = execute('echo "nested\nlines"')
@@ -148,6 +149,27 @@
   unlet xyz
 endfunc
 
+func Test_win_execute_on_startup()
+  CheckRunVimInTerminal
+
+  let lines =<< trim END
+      vim9script
+      [repeat('x', &columns)]->writefile('Xfile1')
+      silent tabedit Xfile2
+      var id = win_getid()
+      silent tabedit Xfile3
+      autocmd VimEnter * win_execute(id, 'close')
+  END
+  call writefile(lines, 'XwinExecute')
+  let buf = RunVimInTerminal('-p Xfile1 -Nu XwinExecute', {})
+
+  " this was crashing on exit with EXITFREE defined
+  call StopVimInTerminal(buf)
+
+  call delete('XwinExecute')
+  call delete('Xfile1')
+endfunc
+
 func Test_execute_func_with_null()
   call assert_equal("", execute(test_null_string()))
   call assert_equal("", execute(test_null_list()))

src/version.c

diff --git a/src/version.c b/src/version.c
index 022c161..bca9382 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3862,
+/**/
     3861,
 /**/
     3860,