aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.4322: Vim9: crash when using funcref with closure

Browse Source 
Problem:    Vim9: crash when using funcref with closure.
Solution:   Keep a reference to the funcref that has the outer context.
            (closes #9716)
This commit is contained in:
Bram Moolenaar
2022-02-07 19:56:43 +00:00
parent 92368aad61
commit 7aca5ca676
6 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/vim9execute.c
View File

@@ -234,6 +234,23 @@ dict_stack_clear(int len)
dict_stack_drop();
}
/*
* Get a pointer to useful "pt_outer" of "pt".
*/
static outer_T *
get_pt_outer(partial_T *pt)
{
partial_T *ptref = pt->pt_outer_partial;
if (ptref == NULL)
return &pt->pt_outer;
// partial using partial (recursively)
while (ptref->pt_outer_partial != NULL)
ptref = ptref->pt_outer_partial;
return &ptref->pt_outer;
}
/*
* Call compiled function "cdf_idx" from compiled code.
* This adds a stack frame and sets the instruction pointer to the start of the
@@ -421,13 +438,13 @@ call_dfunc(
return FAIL;
if (pt != NULL)
{
ref->or_outer = &pt->pt_outer;
ref->or_outer = get_pt_outer(pt);
++pt->pt_refcount;
ref->or_partial = pt;
}
else if (ufunc->uf_partial != NULL)
{
ref->or_outer = &ufunc->uf_partial->pt_outer;
ref->or_outer = get_pt_outer(ufunc->uf_partial);
++ufunc->uf_partial->pt_refcount;
ref->or_partial = ufunc->uf_partial;
}
@@ -5086,7 +5103,9 @@ call_def_function(
goto failed_early;
if (partial != NULL)
{
if (partial->pt_outer.out_stack == NULL)
outer_T *outer = get_pt_outer(partial);
if (outer->out_stack == NULL)
{
if (current_ectx != NULL)
{
@@ -5099,7 +5118,7 @@ call_def_function(
}
else
{
ectx.ec_outer_ref->or_outer = &partial->pt_outer;
ectx.ec_outer_ref->or_outer = outer;
++partial->pt_refcount;
ectx.ec_outer_ref->or_partial = partial;
}