From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 16 Sep 2020 15:22:59 +0000 (+0200)
Subject: patch 8.2.1695: Vim9: crash when using varargs type "any"
X-Git-Tag: v8.2.1695
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f8cbc4b225ba707c3926070a3f133eb0473aed2;p=vim

patch 8.2.1695: Vim9: crash when using varargs type "any"

Problem:    Vim9: crash when using varargs type "any".
Solution:   Check if uf_va_type is &t_any. (closes #6957)
---

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 563e281a0..f0c5e9139 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -319,6 +319,15 @@ def Test_call_def_varargs()
   END
   CheckScriptSuccess(lines)
 
+  lines =<< trim END
+      vim9script
+      def Func(...l: any)
+        echo l
+      enddef
+      Func(0)
+  END
+  CheckScriptSuccess(lines)
+
   lines =<< trim END
       vim9script
       def Func(...l: list<string>)
diff --git a/src/version.c b/src/version.c
index c3efafd0b..be6278605 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 */
+/**/
+    1695,
 /**/
     1694,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 075bd12c4..338fbc639 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1430,8 +1430,8 @@ generate_CALL(cctx_T *cctx, ufunc_T *ufunc, int pushed_argcount)
 		    continue;
 		expected = ufunc->uf_arg_types[i];
 	    }
-	    else if (ufunc->uf_va_type == NULL)
-		// possibly a lambda
+	    else if (ufunc->uf_va_type == NULL || ufunc->uf_va_type == &t_any)
+		// possibly a lambda or "...: any"
 		expected = &t_any;
 	    else
 		expected = ufunc->uf_va_type->tt_member;
diff --git a/src/vim9execute.c b/src/vim9execute.c
index ddc20bce8..7c8f77977 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -829,6 +829,7 @@ call_def_function(
 	// Check the type of the list items.
 	tv = STACK_TV_BOT(-1);
 	if (ufunc->uf_va_type != NULL
+		&& ufunc->uf_va_type != &t_any
 		&& ufunc->uf_va_type->tt_member != &t_any
 		&& tv->vval.v_list != NULL)
 	{