Mercurial > vim
diff src/evalfunc.c @ 24972:b11f38f77006 v8.2.3023
patch 8.2.3023: Vim9: arguments for execute() not checked at compile time
Commit: https://github.com/vim/vim/commit/ca81f0e834640cf3465b3b742e60c12e8a0956f2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 20 14:41:01 2021 +0200
patch 8.2.3023: Vim9: arguments for execute() not checked at compile time
Problem: Vim9: arguments for execute() not checked at compile time.
Solution: Add a function to check the argument types.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 20 Jun 2021 14:45:03 +0200 |
| parents | 7e9e53a0368f |
| children | 4cb423b9250d |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -302,6 +302,27 @@ arg_list_or_blob(type_T *type, argcontex } /* + * Check "type" is a string or a list of strings. + */ + static int +arg_string_or_list(type_T *type, argcontext_T *context) +{ + if (type->tt_type == VAR_ANY || type->tt_type == VAR_STRING) + return OK; + if (type->tt_type != VAR_LIST) + { + arg_type_mismatch(&t_string, type, context->arg_idx + 1); + return FAIL; + } + if (type->tt_member->tt_type == VAR_ANY + || type->tt_member->tt_type == VAR_STRING) + return OK; + + arg_type_mismatch(&t_list_string, type, context->arg_idx + 1); + return FAIL; +} + +/* * Check "type" is a list or a dict. */ static int @@ -385,6 +406,7 @@ argcheck_T arg1_string[] = {arg_string}; argcheck_T arg3_string_nr_bool[] = {arg_string, arg_number, arg_bool}; argcheck_T arg1_float_or_nr[] = {arg_float_or_nr}; argcheck_T arg2_listblob_item[] = {arg_list_or_blob, arg_item_of_prev}; +argcheck_T arg2_execute[] = {arg_string_or_list, arg_string}; argcheck_T arg23_extend[] = {arg_list_or_dict, arg_same_as_prev, arg_extend3}; argcheck_T arg23_extendnew[] = {arg_list_or_dict, arg_same_struct_as_prev, arg_extend3}; argcheck_T arg3_insert[] = {arg_list_or_blob, arg_item_of_prev, arg_number}; @@ -870,7 +892,7 @@ static funcentry_T global_functions[] = ret_number_bool, f_eventhandler}, {"executable", 1, 1, FEARG_1, NULL, ret_number, f_executable}, - {"execute", 1, 2, FEARG_1, NULL, + {"execute", 1, 2, FEARG_1, arg2_execute, ret_string, f_execute}, {"exepath", 1, 1, FEARG_1, NULL, ret_string, f_exepath},