aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.2.0207: crash when missing member type on list argument

Browse Source 
Problem:    Crash when missing member type on list argument.
Solution:   Check for invalid type. (closes #5572)
This commit is contained in:
Bram Moolenaar
2020-02-04 21:54:07 +01:00
parent 26e117e9bc
commit bfe1204312
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/testdir/test_vim9_script.vim
View File

@@ -160,13 +160,16 @@ def Test_call_default_args()
enddef
def Test_return_type_wrong()
" TODO: why is ! needed for Mac and FreeBSD?
CheckScriptFailure(['def Func(): number', 'return "a"', 'enddef'], 'expected number but got string')
CheckScriptFailure(['def Func(): string', 'return 1', 'enddef'], 'expected string but got number')
CheckScriptFailure(['def Func(): void', 'return "a"', 'enddef'], 'expected void but got string')
CheckScriptFailure(['def Func()', 'return "a"', 'enddef'], 'expected void but got string')
enddef
def Test_arg_type_wrong()
CheckScriptFailure(['def Func3(items: list)', 'echo "a"', 'enddef'], 'E1008: Missing <type>')
enddef
def Test_try_catch()
let l = []
try

21
src/userfunc.c
View File

@@ -2968,6 +2968,11 @@ ex_function(exarg_T *eap)
if (eap->cmdidx == CMD_def)
{
int lnum_save = SOURCING_LNUM;
// error messages are for the first function line
SOURCING_LNUM = sourcing_lnum_top;
// parse the argument types
ga_init2(&fp->uf_type_list, sizeof(type_T), 5);
@@ -2981,15 +2986,22 @@ ex_function(exarg_T *eap)
if (fp->uf_arg_types != NULL)
{
int i;
type_T *type;
for (i = 0; i < len; ++ i)
{
p = ((char_u **)argtypes.ga_data)[i];
if (p == NULL)
// todo: get type from default value
fp->uf_arg_types[i] = &t_any;
type = &t_any;
else
fp->uf_arg_types[i] = parse_type(&p, &fp->uf_type_list);
type = parse_type(&p, &fp->uf_type_list);
if (type == NULL)
{
SOURCING_LNUM = lnum_save;
goto errret_2;
}
fp->uf_arg_types[i] = type;
}
}
if (varargs)
@@ -3005,6 +3017,11 @@ ex_function(exarg_T *eap)
fp->uf_va_type = &t_any;
else
fp->uf_va_type = parse_type(&p, &fp->uf_type_list);
if (fp->uf_va_type == NULL)
{
SOURCING_LNUM = lnum_save;
goto errret_2;
}
}
varargs = FALSE;
}

2
src/version.c
View File

@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
207,
/**/
206,
/**/