mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.2.3351: Vim9: using a function by name may delete it
Problem: Vim9: using a function by name may delete it. (Naohiro Ono) Solution: Increment the reference count when using a function by name. (closes #8760)
This commit is contained in:
parent
a401bba080
commit
b033ee2ddf
@ -2636,6 +2636,8 @@ eval_variable(
|
|||||||
{
|
{
|
||||||
ufunc_T *ufunc = find_func(name, FALSE, NULL);
|
ufunc_T *ufunc = find_func(name, FALSE, NULL);
|
||||||
|
|
||||||
|
// In Vim9 script we can get a function reference by using the
|
||||||
|
// function name.
|
||||||
if (ufunc != NULL)
|
if (ufunc != NULL)
|
||||||
{
|
{
|
||||||
found = TRUE;
|
found = TRUE;
|
||||||
@ -2643,6 +2645,8 @@ eval_variable(
|
|||||||
{
|
{
|
||||||
rettv->v_type = VAR_FUNC;
|
rettv->v_type = VAR_FUNC;
|
||||||
rettv->vval.v_string = vim_strsave(ufunc->uf_name);
|
rettv->vval.v_string = vim_strsave(ufunc->uf_name);
|
||||||
|
if (rettv->vval.v_string != NULL)
|
||||||
|
func_ref(ufunc->uf_name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3089,6 +3089,23 @@ def Test_closing_brace_at_start_of_line()
|
|||||||
call CheckDefAndScriptSuccess(lines)
|
call CheckDefAndScriptSuccess(lines)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
func CreateMydict()
|
||||||
|
let g:mydict = {}
|
||||||
|
func g:mydict.afunc()
|
||||||
|
let g:result = self.key
|
||||||
|
endfunc
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
def Test_numbered_function_reference()
|
||||||
|
CreateMydict()
|
||||||
|
var output = execute('legacy func g:mydict.afunc')
|
||||||
|
var funcName = 'g:' .. substitute(output, '.*function \(\d\+\).*', '\1', '')
|
||||||
|
execute 'function(' .. funcName .. ', [], {key: 42})()'
|
||||||
|
# check that the function still exists
|
||||||
|
assert_equal(output, execute('legacy func g:mydict.afunc'))
|
||||||
|
unlet g:mydict
|
||||||
|
enddef
|
||||||
|
|
||||||
if has('python3')
|
if has('python3')
|
||||||
def Test_python3_heredoc()
|
def Test_python3_heredoc()
|
||||||
py3 << trim EOF
|
py3 << trim EOF
|
||||||
|
@ -755,6 +755,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 */
|
||||||
|
/**/
|
||||||
|
3351,
|
||||||
/**/
|
/**/
|
||||||
3350,
|
3350,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user