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 9.0.1468: recursively calling :defer function if it does :qa

Browse Source 
Problem:    Recursively calling :defer function if it does :qa in a compiled
            function.
Solution:   Clear the defer entry before calling the function. (closes #12271)
This commit is contained in:
zeertzjq
2023-04-18 21:04:53 +01:00
committed by Bram Moolenaar
parent 142ffb024d
commit a1f2b5ddc6
3 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vim9execute.c
View File

@@ -1063,6 +1063,10 @@ invoke_defer_funcs(ectx_T *ectx)
int obj_off = functv->v_type == VAR_PARTIAL ? 1 : 0;
int argcount = l->lv_len - 1 - obj_off;
if (functv->vval.v_string == NULL)
// already being called, can happen if function does ":qa"
continue;
if (obj_off == 1)
arg_li = arg_li->li_next; // second list item is the object
for (i = 0; i < argcount; ++i)
@@ -1082,9 +1086,14 @@ invoke_defer_funcs(ectx_T *ectx)
if (funcexe.fe_object != NULL)
++funcexe.fe_object->obj_refcount;
}
(void)call_func(functv->vval.v_string, -1,
&rettv, argcount, argvars, &funcexe);
char_u *name = functv->vval.v_string;
functv->vval.v_string = NULL;
(void)call_func(name, -1, &rettv, argcount, argvars, &funcexe);
clear_tv(&rettv);
vim_free(name);
}
}