From 36818a9daafbcb8e3b06be7b07f52b2d00a61746 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 3 Jan 2023 12:33:26 +0000 Subject: [PATCH] patch 9.0.1138: crash when expecting varargs but it is something else Problem: Crash when expecting varargs but it is something else. Solution: Only use the member when the type is a list. (closes #11774) --- src/testdir/test_vim9_func.vim | 14 ++++++++++++++ src/version.c | 2 ++ src/vim9instr.c | 8 +++++++- src/vim9type.c | 4 +++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index be07aec04..bf8b705ed 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1869,6 +1869,20 @@ def Test_call_varargs_only() v9.CheckDefFailure(['g:MyVarargsOnly("one", 2)'], 'E1013: Argument 2: type mismatch, expected string but got number') enddef +def Test_varargs_mismatch() + var lines =<< trim END + vim9script + + def Map(Fn: func(...any): number): number + return Fn('12') + enddef + + var res = Map((v) => str2nr(v)) + assert_equal(12, res) + END + v9.CheckScriptSuccess(lines) +enddef + def Test_using_var_as_arg() var lines =<< trim END def Func(x: number) diff --git a/src/version.c b/src/version.c index 470853ffc..485512192 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1138, /**/ 1137, /**/ diff --git a/src/vim9instr.c b/src/vim9instr.c index bd2c1b414..72ecbaa65 100644 --- a/src/vim9instr.c +++ b/src/vim9instr.c @@ -1841,7 +1841,13 @@ check_func_args_from_type( type_T *expected; if (varargs && i >= type->tt_argcount - 1) - expected = type->tt_args[type->tt_argcount - 1]->tt_member; + { + expected = type->tt_args[type->tt_argcount - 1]; + if (expected != NULL && expected->tt_type == VAR_LIST) + expected = expected->tt_member; + if (expected == NULL) + expected = &t_any; + } else if (i >= type->tt_min_argcount && actual->tt_type == VAR_SPECIAL) expected = &t_any; diff --git a/src/vim9type.c b/src/vim9type.c index 436a42de5..8ce594816 100644 --- a/src/vim9type.c +++ b/src/vim9type.c @@ -932,8 +932,10 @@ check_argument_types( if (varargs && i >= type->tt_argcount - 1) { expected = type->tt_args[type->tt_argcount - 1]; - if (expected != NULL) + if (expected != NULL && expected->tt_type == VAR_LIST) expected = expected->tt_member; + if (expected == NULL) + expected = &t_any; } else expected = type->tt_args[i]; -- 2.50.1