aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

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

Browse Source 
Problem:    Vim9: crash after running into the "Multiple closures" error.
Solution:   When a function fails still update any closures. (closes #6973)
This commit is contained in:
Bram Moolenaar
2020-09-18 21:25:32 +02:00
parent e8df010498
commit 7cbfaa51de
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vim9execute.c
View File

@@ -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);