changeset 22292:3515f341e8ac v8.2.1695

patch 8.2.1695: Vim9: crash when using varargs type "any" Commit: https://github.com/vim/vim/commit/2f8cbc4b225ba707c3926070a3f133eb0473aed2 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Sep 16 17:22:59 2020 +0200 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 https://github.com/vim/vim/issues/6957)
author Bram Moolenaar <Bram@vim.org>
date Wed, 16 Sep 2020 17:30:03 +0200
parents 9a335daeb41d
children 70b807fe1523
files src/testdir/test_vim9_func.vim src/version.c src/vim9compile.c src/vim9execute.c
diffstat 4 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -321,6 +321,15 @@ def Test_call_def_varargs()
 
   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>)
         echo l
       enddef
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1695,
+/**/
     1694,
 /**/
     1693,
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1430,8 +1430,8 @@ generate_CALL(cctx_T *cctx, ufunc_T *ufu
 		    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;
--- 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)
 	{