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.1749: Vim9: crash when closure fails in nested function

Browse Source 
Problem:    Vim9: crash when closure fails in nested function.
Solution:   Handle function returns before dereferencing remaining closures.
            (closes #7008)
This commit is contained in:
Bram Moolenaar
2020-09-26 19:59:38 +02:00
parent f3c51bbff1
commit c70bdab0b8
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vim9execute.c
View File

@@ -310,9 +310,12 @@ handle_closure_in_use(ectx_T *ectx, int free_arguments)
// Check if any created closure is still in use.
for (idx = 0; idx < closure_count; ++idx)
{
partial_T *pt = ((partial_T **)gap->ga_data)[gap->ga_len
- closure_count + idx];
partial_T *pt;
int off = gap->ga_len - closure_count + idx;
if (off < 0)
continue; // count is off or already done
pt = ((partial_T **)gap->ga_data)[off];
if (pt->pt_refcount > 1)
{
int refcount = pt->pt_refcount;
@@ -2734,14 +2737,14 @@ 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);
// Deal with any remaining closures, they may be in use somewhere.
if (ectx.ec_funcrefs.ga_len > 0)
handle_closure_in_use(&ectx, FALSE);
estack_pop();
current_sctx = save_current_sctx;