mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 15:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0419: the :defer command does not check the function arguments

Browse Source 
Problem:    The :defer command does not check the function argument count and
            types.
Solution:   Check the function arguments when adding a deferred function.

169003289f

Cherry-pick check_internal_func() from Vim, but use EvalFuncDef pointer
as first argument.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-04-17 09:08:25 +08:00
parent 6bfba3660c
commit 7a3f86481e
4 changed files with 112 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/eval/funcs.c
View File

@@ -228,6 +228,31 @@ const EvalFuncDef *find_internal_func(const char *const name)
return index >= 0 ? &functions[index] : NULL;
}
/// Check the argument count to use for internal function "fdef".
/// @return -1 for failure, 0 if no method base accepted, 1 if method base is
/// first argument, 2 if method base is second argument, etc.
int check_internal_func(const EvalFuncDef *const fdef, const int argcount)
FUNC_ATTR_NONNULL_ALL
{
int res;
if (argcount < fdef->min_argc) {
res = FCERR_TOOFEW;
} else if (argcount > fdef->max_argc) {
res = FCERR_TOOMANY;
} else {
return fdef->base_arg;
}
const char *const name = fdef->name;
if (res == FCERR_TOOMANY) {
semsg(_(e_toomanyarg), name);
} else {
semsg(_(e_toofewarg), name);
}
return -1;
}
int call_internal_func(const char *const fname, const int argcount, typval_T *const argvars,
typval_T *const rettv)
FUNC_ATTR_NONNULL_ALL