patch 8.2.3308: Vim9: no runtime check for argument type with varargs only

Problem:    Vim9: no runtime check for argument type if a function only has
            varargs.
Solution:   Also check argument types if uf_va_type is set. (closes #8715)

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 5fdd717924bb1f1c019021198fc762e192b35d1b..5704511df702f1bf161c34f7bf32ccc3c676a819 100644 (file)
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1149,6 +1149,18 @@ def Test_call_def_varargs()
       enddef
   END
   CheckScriptFailure(lines, 'E1160:')
+
+  lines =<< trim END
+      vim9script
+      def DoIt()
+        g:Later('')
+      enddef
+      defcompile
+      def g:Later(...l:  list<number>)
+      enddef
+      DoIt()
+  END
+  CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected number but got string')
 enddef
 
 let s:value = ''

diff --git a/src/version.c b/src/version.c
index 9d5ede555a757bbf946299e152f0732edf2edc16..867d894a2f8c31c3d285f9d89e5d6caf59df251a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3308,
 /**/
     3307,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index 690b7e0b6292d720dba2ad0a027e107e12933cce..b7288151272d5e17c1472d2499c32c0e9965352e 100644 (file)
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -893,7 +893,7 @@ call_by_name(
 
     if (ufunc != NULL)
     {
-       if (ufunc->uf_arg_types != NULL)
+       if (ufunc->uf_arg_types != NULL || ufunc->uf_va_type != NULL)
        {
            int i;
            typval_T    *argv = STACK_TV_BOT(0) - argcount;
@@ -904,7 +904,7 @@ call_by_name(
            {
                type_T *type = NULL;
 
-               if (i < ufunc->uf_args.ga_len)
+               if (i < ufunc->uf_args.ga_len && ufunc->uf_arg_types != NULL)
                    type = ufunc->uf_arg_types[i];
                else if (ufunc->uf_va_type != NULL)
                    type = ufunc->uf_va_type->tt_member;