From 6ce46b99635877fb0a17c06a6f5625fbc1ffa6f4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 7 Aug 2021 15:35:36 +0200 Subject: [PATCH] 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) --- src/testdir/test_vim9_func.vim | 12 ++++++++++++ src/version.c | 2 ++ src/vim9execute.c | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 5fdd71792..5704511df 100644 --- 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) + 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 9d5ede555..867d894a2 100644 --- 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 690b7e0b6..b72881512 100644 --- 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; -- 2.40.0