# HG changeset patch # User Bram Moolenaar # Date 1600270203 -7200 # Node ID 3515f341e8ac4df5bb714b74cf0ff5ad8b2e1bbe # Parent 9a335daeb41d3f4b90497e04e248874360dbf541 patch 8.2.1695: Vim9: crash when using varargs type "any" Commit: https://github.com/vim/vim/commit/2f8cbc4b225ba707c3926070a3f133eb0473aed2 Author: Bram Moolenaar 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) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim --- 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) echo l enddef diff --git a/src/version.c b/src/version.c --- 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, diff --git a/src/vim9compile.c b/src/vim9compile.c --- 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; diff --git a/src/vim9execute.c b/src/vim9execute.c --- 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) {