patch 8.2.0449: Vim9: crash if return type is invalid
Problem: Vim9: crash if return type is invalid. (Yegappan Lakshmanan)
Solution: Always return some type, not NULL.
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 9157a1d..9b49e7c 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -269,6 +269,9 @@
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')
+
+ CheckScriptFailure(['def Func(): list', 'return []', 'enddef'], 'E1008:')
+ CheckScriptFailure(['def Func(): dict', 'return {}', 'enddef'], 'E1008:')
enddef
def Test_arg_type_wrong()
diff --git a/src/version.c b/src/version.c
index f1d2f66..0d7b641 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 449,
+/**/
448,
/**/
447,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index a595580..dd31092 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1375,19 +1375,19 @@
emsg(_("E1007: No white space allowed before <"));
else
emsg(_("E1008: Missing <type>"));
- return NULL;
+ return type;
}
*arg = skipwhite(*arg + 1);
member_type = parse_type(arg, type_list);
if (member_type == NULL)
- return NULL;
+ return type;
*arg = skipwhite(*arg);
if (**arg != '>')
{
emsg(_("E1009: Missing > after type"));
- return NULL;
+ return type;
}
++*arg;