mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2172: Vim9: number of arguments is not always checked (#23142)

Browse Source 
Problem:    Vim9: number of arguments is not always checked. (Yegappan
            Lakshmanan)
Solution:   Check number of arguments when calling function by name.

5082471f91

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-04-17 09:07:30 +08:00
committed by GitHub
parent 55d346fc26
commit 78535664bd
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/eval/userfunc.c
View File

@@ -1290,6 +1290,21 @@ static bool func_name_refcount(const char *name)
return isdigit((uint8_t)(*name)) || *name == '<'; return isdigit((uint8_t)(*name)) || *name == '<';
} }
/// Check the argument count for user function "fp".
/// @return FCERR_UNKNOWN if OK, FCERR_TOOFEW or FCERR_TOOMANY otherwise.
static int check_user_func_argcount(ufunc_T *fp, int argcount)
FUNC_ATTR_NONNULL_ALL
{
const int regular_args = fp->uf_args.ga_len;
if (argcount < regular_args - fp->uf_def_args.ga_len) {
return FCERR_TOOFEW;
} else if (!fp->uf_varargs && argcount > regular_args) {
return FCERR_TOOMANY;
}
return FCERR_UNKNOWN;
}
/// Call a user function after checking the arguments. /// Call a user function after checking the arguments.
static int call_user_func_check(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, static int call_user_func_check(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv,
funcexe_T *funcexe, dict_T *selfdict) funcexe_T *funcexe, dict_T *selfdict)
@@ -1302,12 +1317,11 @@ static int call_user_func_check(ufunc_T *fp, int argcount, typval_T *argvars, ty
if ((fp->uf_flags & FC_RANGE) && funcexe->fe_doesrange != NULL) { if ((fp->uf_flags & FC_RANGE) && funcexe->fe_doesrange != NULL) {
*funcexe->fe_doesrange = true; *funcexe->fe_doesrange = true;
} }
int error; int error = check_user_func_argcount(fp, argcount);
if (argcount < fp->uf_args.ga_len - fp->uf_def_args.ga_len) { if (error != FCERR_UNKNOWN) {
error = FCERR_TOOFEW; return error;
} else if (!fp->uf_varargs && argcount > fp->uf_args.ga_len) { }
error = FCERR_TOOMANY; if ((fp->uf_flags & FC_DICT) && selfdict == NULL) {
} else if ((fp->uf_flags & FC_DICT) && selfdict == NULL) {
error = FCERR_DICT; error = FCERR_DICT;
} else { } else {
// Call the user function. // Call the user function.