diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-12-25 19:29:21 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-12-25 19:29:21 +0000 |
commit | 223d0a6bc8dc68039ceb6660de9576fafe178d73 (patch) | |
tree | 0f9028c48b6ba36d5a093ac91bbe99ccc080a075 | |
parent | 5cd647935d0834b3064aa36384b8f6730fadadd6 (diff) |
patch 8.2.3894: Vim9: no proper type check for first argument of call()v8.2.3894
Problem: Vim9: no proper type check for first argument of call().
Solution: Add specific type check.
-rw-r--r-- | src/errors.h | 2 | ||||
-rw-r--r-- | src/evalfunc.c | 3 | ||||
-rw-r--r-- | src/proto/typval.pro | 1 | ||||
-rw-r--r-- | src/testdir/test_vim9_builtin.vim | 3 | ||||
-rw-r--r-- | src/typval.c | 17 | ||||
-rw-r--r-- | src/version.c | 2 |
6 files changed, 27 insertions, 1 deletions
diff --git a/src/errors.h b/src/errors.h index e5b8cd218e..e39e4044ad 100644 --- a/src/errors.h +++ b/src/errors.h @@ -852,3 +852,5 @@ EXTERN char e_cannot_use_script_variable_in_for_loop[] INIT(= N_("E1254: Cannot use script variable in for loop")); EXTERN char e_cmd_mapping_must_end_with_cr[] INIT(= N_("E1255: <Cmd> mapping must end with <CR>")); +EXTERN char e_string_or_function_required_for_argument_nr[] + INIT(= N_("E1256: String or function required for argument %d")); diff --git a/src/evalfunc.c b/src/evalfunc.c index 8f52053938..e4fa35b4ef 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -2858,7 +2858,8 @@ f_call(typval_T *argvars, typval_T *rettv) dict_T *selfdict = NULL; if (in_vim9script() - && (check_for_list_arg(argvars, 1) == FAIL + && (check_for_string_or_func_arg(argvars, 0) == FAIL + || check_for_list_arg(argvars, 1) == FAIL || check_for_opt_dict_arg(argvars, 2) == FAIL)) return; diff --git a/src/proto/typval.pro b/src/proto/typval.pro index f5804a3179..f04bf1539a 100644 --- a/src/proto/typval.pro +++ b/src/proto/typval.pro @@ -40,6 +40,7 @@ int check_for_string_or_dict_arg(typval_T *args, int idx); int check_for_string_or_number_or_list_arg(typval_T *args, int idx); int check_for_opt_string_or_number_or_list_arg(typval_T *args, int idx); int check_for_string_or_list_or_dict_arg(typval_T *args, int idx); +int check_for_string_or_func_arg(typval_T *args, int idx); int check_for_list_or_blob_arg(typval_T *args, int idx); int check_for_list_or_dict_arg(typval_T *args, int idx); int check_for_list_or_dict_or_blob_arg(typval_T *args, int idx); diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index 298a3be522..1bdb12b039 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -402,6 +402,9 @@ def Test_call_call() var l = [3, 2, 1] call('reverse', [l]) l->assert_equal([1, 2, 3]) + + CheckDefExecAndScriptFailure(['call(123, [2])'], 'E1256: String or function required for argument 1') + CheckDefExecAndScriptFailure(['call(true, [2])'], 'E1256: String or function required for argument 1') CheckDefAndScriptFailure(['call("reverse", 2)'], ['E1013: Argument 2: type mismatch, expected list<any> but got number', 'E1211: List required for argument 2']) CheckDefAndScriptFailure(['call("reverse", [2], [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3']) enddef diff --git a/src/typval.c b/src/typval.c index 358e04e67e..2f773b602e 100644 --- a/src/typval.c +++ b/src/typval.c @@ -757,6 +757,23 @@ check_for_string_or_list_or_dict_arg(typval_T *args, int idx) } /* + * Give an error and return FAIL unless "args[idx]" is a string + * or a function reference. + */ + int +check_for_string_or_func_arg(typval_T *args, int idx) +{ + if (args[idx].v_type != VAR_PARTIAL + && args[idx].v_type != VAR_FUNC + && args[idx].v_type != VAR_STRING) + { + semsg(_(e_string_or_function_required_for_argument_nr), idx + 1); + return FAIL; + } + return OK; +} + +/* * Give an error and return FAIL unless "args[idx]" is a list or a blob. */ int diff --git a/src/version.c b/src/version.c index 423ec6ecc1..c4e4ad0814 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 */ /**/ + 3894, +/**/ 3893, /**/ 3892, |