Mercurial > vim
diff src/time.c @ 25252:acda780ffc3e v8.2.3162
patch 8.2.3162: Vim9: argument types are not checked at compile time
Commit: https://github.com/vim/vim/commit/1a71d31bf34b0b2b08517903826004ec6fd440e5
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Thu Jul 15 12:49:58 2021 +0200
patch 8.2.3162: Vim9: argument types are not checked at compile time
Problem: Vim9: argument types are not checked at compile time.
Solution: Add more type checks. (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/8560)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 15 Jul 2021 13:00:06 +0200 |
| parents | 532faf893d37 |
| children | 4d3c68196d05 |
line wrap: on
line diff
--- a/src/time.c +++ b/src/time.c @@ -169,6 +169,10 @@ f_reltime(typval_T *argvars UNUSED, typv # ifdef FEAT_RELTIME proftime_T res; proftime_T start; + long n1, n2; + + if (rettv_list_alloc(rettv) != OK) + return; if (argvars[0].v_type == VAR_UNKNOWN) { @@ -198,20 +202,15 @@ f_reltime(typval_T *argvars UNUSED, typv profile_sub(&res, &start); } - if (rettv_list_alloc(rettv) == OK) - { - long n1, n2; - # ifdef MSWIN - n1 = res.HighPart; - n2 = res.LowPart; + n1 = res.HighPart; + n2 = res.LowPart; # else - n1 = res.tv_sec; - n2 = res.tv_usec; + n1 = res.tv_sec; + n2 = res.tv_usec; # endif - list_append_number(rettv->vval.v_list, (varnumber_T)n1); - list_append_number(rettv->vval.v_list, (varnumber_T)n2); - } + list_append_number(rettv->vval.v_list, (varnumber_T)n1); + list_append_number(rettv->vval.v_list, (varnumber_T)n2); # endif } @@ -269,6 +268,12 @@ f_strftime(typval_T *argvars, typval_T * time_t seconds; char_u *p; + if (in_vim9script() + && (check_for_string_arg(argvars, 0) == FAIL + || (argvars[1].v_type != VAR_UNKNOWN + && check_for_number_arg(argvars, 1) == FAIL))) + return; + rettv->v_type = VAR_STRING; p = tv_get_string(&argvars[0]);