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 #6973)
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 4332c03..5fe5878 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2676,15 +2676,11 @@
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 @@
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);