mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Problem: Vim9: crash when calling partial with wrong function. Solution: Check argument types of called function. (closes #7912)
This commit is contained in:
@@ -2367,6 +2367,30 @@ def Test_nested_lambda_in_closure()
|
||||
delete('XnestedDone')
|
||||
enddef
|
||||
|
||||
def Test_check_func_arg_types()
|
||||
var lines =<< trim END
|
||||
vim9script
|
||||
def F1(x: string): string
|
||||
return x
|
||||
enddef
|
||||
|
||||
def F2(x: number): number
|
||||
return x + 1
|
||||
enddef
|
||||
|
||||
def G(g: func): dict<func>
|
||||
return {f: g}
|
||||
enddef
|
||||
|
||||
def H(d: dict<func>): string
|
||||
return d.f('a')
|
||||
enddef
|
||||
END
|
||||
|
||||
CheckScriptSuccess(lines + ['echo H(G(F1))'])
|
||||
CheckScriptFailure(lines + ['echo H(G(F2))'], 'E1013:')
|
||||
enddef
|
||||
|
||||
|
||||
|
||||
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
|
||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2574,
|
||||
/**/
|
||||
2573,
|
||||
/**/
|
||||
|
@@ -797,7 +797,27 @@ call_by_name(char_u *name, int argcount, ectx_T *ectx, isn_T *iptr)
|
||||
}
|
||||
|
||||
if (ufunc != NULL)
|
||||
{
|
||||
if (ufunc->uf_arg_types != NULL)
|
||||
{
|
||||
int i;
|
||||
typval_T *argv = STACK_TV_BOT(0) - argcount;
|
||||
|
||||
// The function can change at runtime, check that the argument
|
||||
// types are correct.
|
||||
for (i = 0; i < argcount; ++i)
|
||||
{
|
||||
type_T *type = i < ufunc->uf_args.ga_len
|
||||
? ufunc->uf_arg_types[i] : ufunc->uf_va_type;
|
||||
|
||||
if (type != NULL && check_typval_arg_type(type,
|
||||
&argv[i], i + 1) == FAIL)
|
||||
return FAIL;
|
||||
}
|
||||
}
|
||||
|
||||
return call_ufunc(ufunc, NULL, argcount, ectx, iptr);
|
||||
}
|
||||
|
||||
return FAIL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user