From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 4 Nov 2020 11:00:53 +0000 (+0100)
Subject: patch 8.2.1950: Vim9: crash when compiling function fails when getting type
X-Git-Tag: v8.2.1950
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c13f76275047a4d6302c077fb40bc9c397ff027;p=vim

patch 8.2.1950: Vim9: crash when compiling function fails when getting type

Problem:    Vim9: crash when compiling function fails when getting type.
Solution:   Handle NULL type. (closes #7253)
---

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 8f691e6b4..656718c49 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1749,6 +1749,15 @@ def Test_expr7_list_vim9script()
     var l: list<string> = [234, 'x']
   END
   CheckScriptFailure(lines, 'E1012:', 2)
+
+  lines =<< trim END
+      vim9script
+      def Failing()
+        job_stop()
+      enddef
+      var list = [Failing]
+  END
+  CheckScriptFailure(lines, 'E119:', 1)
 enddef
 
 def LambdaWithComments(): func
@@ -2009,6 +2018,15 @@ def Test_expr7_dict_vim9script()
     var l: dict<string> = #{a: 234, b: 'x'}
   END
   CheckScriptFailure(lines, 'E1012:', 2)
+
+  lines =<< trim END
+      vim9script
+      def Failing()
+        job_stop()
+      enddef
+      var dict = #{name: Failing}
+  END
+  CheckScriptFailure(lines, 'E119:', 1)
 enddef
 
 let g:oneString = 'one'
diff --git a/src/version.c b/src/version.c
index 112077a98..150bfd23b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1950,
 /**/
     1949,
 /**/
diff --git a/src/vim9type.c b/src/vim9type.c
index b50f5f18e..27daf8366 100644
--- a/src/vim9type.c
+++ b/src/vim9type.c
@@ -108,7 +108,7 @@ get_list_type(type_T *member_type, garray_T *type_gap)
     type_T *type;
 
     // recognize commonly used types
-    if (member_type->tt_type == VAR_ANY)
+    if (member_type == NULL || member_type->tt_type == VAR_ANY)
 	return &t_list_any;
     if (member_type->tt_type == VAR_VOID
 	    || member_type->tt_type == VAR_UNKNOWN)
@@ -137,7 +137,7 @@ get_dict_type(type_T *member_type, garray_T *type_gap)
     type_T *type;
 
     // recognize commonly used types
-    if (member_type->tt_type == VAR_ANY)
+    if (member_type == NULL || member_type->tt_type == VAR_ANY)
 	return &t_dict_any;
     if (member_type->tt_type == VAR_VOID
 	    || member_type->tt_type == VAR_UNKNOWN)
@@ -408,6 +408,7 @@ typval2type_vimvar(typval_T *tv, garray_T *type_gap)
 
 /*
  * Return FAIL if "expected" and "actual" don't match.
+ * When "argidx" > 0 it is included in the error message.
  */
     int
 check_typval_type(type_T *expected, typval_T *actual_tv, int argidx)