diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-12-30 13:29:00 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-12-30 13:29:00 +0000 |
commit | 13789bf10338a0d049c78acfdc0870fc63e63f4f (patch) | |
tree | b2d619123d4f75d81a05864b9167b832a485d847 | |
parent | 5d2e007ccbfbd749a1f201d06965b8811ff50e6e (diff) | |
download | vim-git-13789bf10338a0d049c78acfdc0870fc63e63f4f.tar.gz |
patch 8.2.3945: Vim9: partial variable argument types are wrongv8.2.3945
Problem: Vim9: partial variable argument types are wrong, leading to a
crash.
Solution: When adjusting the argument count also adjust the argument types.
(closes #9433)
-rw-r--r-- | src/testdir/test_vim9_assign.vim | 30 | ||||
-rw-r--r-- | src/userfunc.c | 6 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9type.c | 15 |
4 files changed, 53 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index 9a26d55fd..f02da7fe4 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -847,6 +847,36 @@ def Test_assignment_partial() Ref() END CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + + var nres: any + var sres: any + def Func(n: number, s = '') + nres = n + sres = s + enddef + + var n: number + var Ref = function(Func, [n]) + Ref('x') + assert_equal(0, nres) + assert_equal('x', sres) + END + CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + + def Func(n: number, s = '') + enddef + + var n: number + var Ref = function(Func, [n]) + Ref(0) + END + CheckScriptFailure(lines, 'E1013: Argument 2: type mismatch, expected string but got number') enddef def Test_assignment_list_any_index() diff --git a/src/userfunc.c b/src/userfunc.c index d4d28c529..85a1cd315 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -3326,6 +3326,7 @@ call_func( int argv_base = 0; partial_T *partial = funcexe->fe_partial; type_T check_type; + type_T *check_type_args[MAX_FUNC_ARGS]; // Initialize rettv so that it is safe for caller to invoke clear_tv(rettv) // even when call_func() returns FAIL. @@ -3377,6 +3378,11 @@ call_func( // make a copy of the type with the correction. check_type = *funcexe->fe_check_type; funcexe->fe_check_type = &check_type; + check_type.tt_args = check_type_args; + CLEAR_FIELD(check_type_args); + for (i = 0; i < check_type.tt_argcount; ++i) + check_type_args[i + partial->pt_argc] = + check_type.tt_args[i]; check_type.tt_argcount += partial->pt_argc; check_type.tt_min_argcount += partial->pt_argc; } diff --git a/src/version.c b/src/version.c index f5f3c3034..a04c91cbd 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3945, +/**/ 3944, /**/ 3943, diff --git a/src/vim9type.c b/src/vim9type.c index 4542e1e08..a9fb5b0e7 100644 --- a/src/vim9type.c +++ b/src/vim9type.c @@ -371,6 +371,18 @@ typval2type_int(typval_T *tv, int copyID, garray_T *type_gap, int do_member) *type = *ufunc->uf_func_type; type->tt_argcount -= tv->vval.v_partial->pt_argc; type->tt_min_argcount -= tv->vval.v_partial->pt_argc; + if (type->tt_argcount == 0) + type->tt_args = NULL; + else + { + int i; + + func_type_add_arg_types(type, type->tt_argcount, + type_gap); + for (i = 0; i < type->tt_argcount; ++i) + type->tt_args[i] = ufunc->uf_func_type->tt_args[ + i + tv->vval.v_partial->pt_argc]; + } return type; } return ufunc->uf_func_type; @@ -464,6 +476,9 @@ check_typval_type(type_T *expected, typval_T *actual_tv, where_T where) type_T *actual_type; int res = FAIL; + if (expected == NULL) + return OK; // didn't expect anything. + // For some values there is no type, assume an error will be given later // for an invalid value. if ((actual_tv->v_type == VAR_FUNC && actual_tv->vval.v_string == NULL) |