Mercurial > vim
diff src/filepath.c @ 24246:35603c7991d7 v8.2.2664
patch 8.2.2664: Vim9: not enough function arguments checked for string
Commit: https://github.com/vim/vim/commit/32105ae88f3aa6a6af30336f0bc9f8eb81292cd7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 27 18:59:25 2021 +0100
patch 8.2.2664: Vim9: not enough function arguments checked for string
Problem: Vim9: not enough function arguments checked for string.
Solution: Check in balloon functions. Refactor function arguments.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 27 Mar 2021 19:00:04 +0100 |
parents | 083f07f99e20 |
children | 01b274c3f69b |
line wrap: on
line diff
--- a/src/filepath.c +++ b/src/filepath.c @@ -861,7 +861,7 @@ f_delete(typval_T *argvars, typval_T *re void f_executable(typval_T *argvars, typval_T *rettv) { - if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) + if (in_vim9script() && check_for_string_arg(argvars, 0) == FAIL) return; // Check in $PATH and also check directly if there is a directory name. @@ -876,7 +876,7 @@ f_exepath(typval_T *argvars, typval_T *r { char_u *p = NULL; - if (in_vim9script() && check_for_nonempty_string(&argvars[0], 1) == FAIL) + if (in_vim9script() && check_for_nonempty_string_arg(argvars, 0) == FAIL) return; (void)mch_can_exe(tv_get_string(&argvars[0]), &p, TRUE); rettv->v_type = VAR_STRING; @@ -893,7 +893,7 @@ f_filereadable(typval_T *argvars, typval char_u *p; int n; - if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) + if (in_vim9script() && check_for_string_arg(argvars, 0) == FAIL) return; #ifndef O_NONBLOCK # define O_NONBLOCK 0 @@ -918,7 +918,7 @@ f_filereadable(typval_T *argvars, typval void f_filewritable(typval_T *argvars, typval_T *rettv) { - if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) + if (in_vim9script() && check_for_string_arg(argvars, 0) == FAIL) return; rettv->vval.v_number = filewritable(tv_get_string(&argvars[0])); } @@ -942,7 +942,7 @@ findfilendir( rettv->vval.v_string = NULL; rettv->v_type = VAR_STRING; - if (in_vim9script() && check_for_nonempty_string(&argvars[0], 1) == FAIL) + if (in_vim9script() && check_for_nonempty_string_arg(argvars, 0) == FAIL) return; #ifdef FEAT_SEARCHPATH @@ -1023,8 +1023,8 @@ f_fnamemodify(typval_T *argvars, typval_ char_u *fbuf = NULL; char_u buf[NUMBUFLEN]; - if (in_vim9script() && (check_for_string(&argvars[0], 1) == FAIL - || check_for_string(&argvars[1], 2) == FAIL)) + if (in_vim9script() && (check_for_string_arg(argvars, 0) == FAIL + || check_for_string_arg(argvars, 1) == FAIL)) return; fname = tv_get_string_chk(&argvars[0]); mods = tv_get_string_buf_chk(&argvars[1], buf); @@ -1135,7 +1135,7 @@ f_getfperm(typval_T *argvars, typval_T * char_u *perm = NULL; char_u permbuf[] = "---------"; - if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) + if (in_vim9script() && check_for_string_arg(argvars, 0) == FAIL) return; fname = tv_get_string(&argvars[0]); @@ -1154,7 +1154,7 @@ f_getfsize(typval_T *argvars, typval_T * char_u *fname; stat_T st; - if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) + if (in_vim9script() && check_for_string_arg(argvars, 0) == FAIL) return; fname = tv_get_string(&argvars[0]); @@ -1184,7 +1184,7 @@ f_getftime(typval_T *argvars, typval_T * char_u *fname; stat_T st; - if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) + if (in_vim9script() && check_for_string_arg(argvars, 0) == FAIL) return; fname = tv_get_string(&argvars[0]); if (mch_stat((char *)fname, &st) >= 0) @@ -1230,7 +1230,7 @@ f_getftype(typval_T *argvars, typval_T * stat_T st; char_u *type = NULL; - if (in_vim9script() && check_for_string(&argvars[0], 1) == FAIL) + if (in_vim9script() && check_for_string_arg(argvars, 0) == FAIL) return; fname = tv_get_string(&argvars[0]); @@ -2411,9 +2411,9 @@ f_browse(typval_T *argvars UNUSED, typva int error = FALSE; if (in_vim9script() - && (check_for_string(&argvars[1], 2) == FAIL - || check_for_string(&argvars[2], 3) == FAIL - || check_for_string(&argvars[3], 4) == FAIL)) + && (check_for_string_arg(argvars, 1) == FAIL + || check_for_string_arg(argvars, 2) == FAIL + || check_for_string_arg(argvars, 3) == FAIL)) return; save = (int)tv_get_number_chk(&argvars[0], &error); title = tv_get_string_chk(&argvars[1]);