patch 9.0.1119: type of arguments not checked when calling a partial
Problem: Type of arguments not checked when calling a partial.
Solution: Give an error for a wrong argument type. (closes #11753)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 0edf7ea..3840d11 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
Binary files differ
diff --git a/src/version.c b/src/version.c
index a66b588..92c70ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1119,
+/**/
1118,
/**/
1117,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 06229b8..2bc81c3 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -377,6 +377,41 @@
}
/*
+ * Check "argcount" arguments on the stack against what "ufunc" expects.
+ * "off" is the offset of arguments on the stack.
+ * Return OK or FAIL.
+ */
+ static int
+check_ufunc_arg_types(ufunc_T *ufunc, int argcount, int off, ectx_T *ectx)
+{
+ if (ufunc->uf_arg_types != NULL || ufunc->uf_va_type != NULL)
+ {
+ typval_T *argv = STACK_TV_BOT(0) - argcount - off;
+
+ // The function can change at runtime, check that the argument
+ // types are correct.
+ for (int i = 0; i < argcount; ++i)
+ {
+ type_T *type = NULL;
+
+ // assume a v:none argument, using the default value, is always OK
+ if (argv[i].v_type == VAR_SPECIAL
+ && argv[i].vval.v_number == VVAL_NONE)
+ continue;
+
+ 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;
+ if (type != NULL && check_typval_arg_type(type,
+ &argv[i], NULL, i + 1) == FAIL)
+ return FAIL;
+ }
+ }
+ return OK;
+}
+
+/*
* Call compiled function "cdf_idx" from compiled code.
* This adds a stack frame and sets the instruction pointer to the start of the
* called function.
@@ -498,6 +533,10 @@
return FAIL;
}
+ // Check the argument types.
+ if (check_ufunc_arg_types(ufunc, argcount, vararg_count, ectx) == FAIL)
+ return FAIL;
+
// Reserve space for:
// - missing arguments
// - stack frame
@@ -1345,26 +1384,8 @@
if (ufunc != NULL)
{
- if (ufunc->uf_arg_types != NULL || ufunc->uf_va_type != NULL)
- {
- int i;
- typval_T *argv = STACK_TV_BOT(0) - argcount;
-
- // The function can change at runtime, check that the argument
- // types are correct.
- for (i = 0; i < argcount; ++i)
- {
- type_T *type = NULL;
-
- 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;
- if (type != NULL && check_typval_arg_type(type,
- &argv[i], NULL, i + 1) == FAIL)
- return FAIL;
- }
- }
+ if (check_ufunc_arg_types(ufunc, argcount, 0, ectx) == FAIL)
+ return FAIL;
return call_ufunc(ufunc, NULL, argcount, ectx, iptr, selfdict);
}