mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.2.1749: Vim9: crash when closure fails in nested function
Problem: Vim9: crash when closure fails in nested function. Solution: Handle function returns before dereferencing remaining closures. (closes #7008)
This commit is contained in:
@@ -1370,6 +1370,20 @@ def Test_double_closure_fails()
|
|||||||
CheckScriptSuccess(lines)
|
CheckScriptSuccess(lines)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
def Test_nested_closure_fails()
|
||||||
|
let lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
def FuncA()
|
||||||
|
FuncB(0)
|
||||||
|
enddef
|
||||||
|
def FuncB(n: number): list<string>
|
||||||
|
return map([0], {_, v -> n})
|
||||||
|
enddef
|
||||||
|
FuncA()
|
||||||
|
END
|
||||||
|
CheckScriptFailure(lines, 'E1012:')
|
||||||
|
enddef
|
||||||
|
|
||||||
def Test_sort_return_type()
|
def Test_sort_return_type()
|
||||||
let res: list<number>
|
let res: list<number>
|
||||||
res = [1, 2, 3]->sort()
|
res = [1, 2, 3]->sort()
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1749,
|
||||||
/**/
|
/**/
|
||||||
1748,
|
1748,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -310,9 +310,12 @@ handle_closure_in_use(ectx_T *ectx, int free_arguments)
|
|||||||
// Check if any created closure is still in use.
|
// Check if any created closure is still in use.
|
||||||
for (idx = 0; idx < closure_count; ++idx)
|
for (idx = 0; idx < closure_count; ++idx)
|
||||||
{
|
{
|
||||||
partial_T *pt = ((partial_T **)gap->ga_data)[gap->ga_len
|
partial_T *pt;
|
||||||
- closure_count + idx];
|
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)
|
if (pt->pt_refcount > 1)
|
||||||
{
|
{
|
||||||
int refcount = pt->pt_refcount;
|
int refcount = pt->pt_refcount;
|
||||||
@@ -2734,14 +2737,14 @@ done:
|
|||||||
ret = OK;
|
ret = OK;
|
||||||
|
|
||||||
failed:
|
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.
|
// When failed need to unwind the call stack.
|
||||||
while (ectx.ec_frame_idx != initial_frame_idx)
|
while (ectx.ec_frame_idx != initial_frame_idx)
|
||||||
func_return(&ectx);
|
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();
|
estack_pop();
|
||||||
current_sctx = save_current_sctx;
|
current_sctx = save_current_sctx;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user