# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1600457404 -7200
# Node ID 41e118669df33a084f8f0ce470727eebab1b6cb9
# Parent  9b684e0b4c2f5553f6ad7f5f921de73b9f54dad0
patch 8.2.1706: Vim9: crash after running into the "Multiple closures" error

Commit: https://github.com/vim/vim/commit/7cbfaa51de7b225effdc79a008c71a5551883c38
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Sep 18 21:25:32 2020 +0200

    patch 8.2.1706: Vim9: crash after running into the "Multiple closures" error

    Problem:    Vim9: crash after running into the "Multiple closures" error.
    Solution:   When a function fails still update any closures. (closes https://github.com/vim/vim/issues/6973)

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1294,6 +1294,20 @@ def Test_call_closure_not_compiled()
   GetResult(g:Ref)->assert_equal('sometext')
 enddef
 
+def Test_double_closure_fails()
+  let lines =<< trim END
+    vim9script
+    def Func()
+    let var = 0
+    for i in range(2)
+	timer_start(0, {-> var})
+    endfor
+    enddef
+    Func()
+  END
+  CheckScriptFailure(lines, 'Multiple closures not supported yet')
+enddef
+
 def Test_sort_return_type()
   let res: list<number>
   res = [1, 2, 3]->sort()
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1706,
+/**/
     1705,
 /**/
     1704,
diff --git a/src/vim9execute.c b/src/vim9execute.c
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2676,15 +2676,11 @@ call_def_function(
 	continue;
 
 func_return:
-	// Restore previous function. If the frame pointer is zero then there
-	// is none and we are done.
+	// Restore previous function. If the frame pointer is where we started
+	// then there is none and we are done.
 	if (ectx.ec_frame_idx == initial_frame_idx)
-	{
-	    if (handle_closure_in_use(&ectx, FALSE) == FAIL)
-		// only fails when out of memory
-		goto failed;
 	    goto done;
-	}
+
 	if (func_return(&ectx) == FAIL)
 	    // only fails when out of memory
 	    goto failed;
@@ -2703,6 +2699,10 @@ done:
     ret = OK;
 
 failed:
+    // Also deal with closures when failed, they may already be in use
+    // somewhere.
+    handle_closure_in_use(&ectx, FALSE);
+
     // When failed need to unwind the call stack.
     while (ectx.ec_frame_idx != initial_frame_idx)
 	func_return(&ectx);