# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1585225804 -3600
# Node ID 99248f0ff29d6d297c3bb69decda733cbf2ffaf1
# Parent  39dbaf2eec63a9b05b1f8ad8b2311e8fbcf92f6a
patch 8.2.0449: Vim9: crash if return type is invalid

Commit: https://github.com/vim/vim/commit/cf3f8bf4ddfbc0f5ce53f0c9270dc15567f4feea
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Mar 26 13:15:42 2020 +0100

    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
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -269,6 +269,9 @@ def Test_return_type_wrong()
   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
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    449,
+/**/
     448,
 /**/
     447,
diff --git a/src/vim9compile.c b/src/vim9compile.c
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1375,19 +1375,19 @@ parse_type_member(char_u **arg, type_T *
 	    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;