Mercurial > vim
changeset 26731:7f4cc4e58f75 v8.2.3894
patch 8.2.3894: Vim9: no proper type check for first argument of call()
Commit: https://github.com/vim/vim/commit/223d0a6bc8dc68039ceb6660de9576fafe178d73
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 25 19:29:21 2021 +0000
patch 8.2.3894: Vim9: no proper type check for first argument of call()
Problem: Vim9: no proper type check for first argument of call().
Solution: Add specific type check.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 25 Dec 2021 20:30:03 +0100 |
parents | fc326a1245cf |
children | bf95026c4399 |
files | src/errors.h src/evalfunc.c src/proto/typval.pro src/testdir/test_vim9_builtin.vim src/typval.c src/version.c |
diffstat | 6 files changed, 27 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -852,3 +852,5 @@ EXTERN char e_cannot_use_script_variable 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"));
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -2858,7 +2858,8 @@ f_call(typval_T *argvars, typval_T *rett 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;
--- a/src/proto/typval.pro +++ b/src/proto/typval.pro @@ -40,6 +40,7 @@ int check_for_string_or_dict_arg(typval_ 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);
--- 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
--- a/src/typval.c +++ b/src/typval.c @@ -757,6 +757,23 @@ check_for_string_or_list_or_dict_arg(typ } /* + * 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