mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 01:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1524: passing -1 for bool is not always rejected

Browse Source 
Problem:    Passing -1 for bool is not always rejected.
Solution:   Check for error in a better way. (closes vim/vim#12358)

8cf51376b8
This commit is contained in:
zeertzjq
2023-05-08 22:49:53 +08:00
parent d745433817
commit 625926f729
4 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/nvim/strings.c
View File

@@ -1515,11 +1515,13 @@ static void byteidx_common(typval_T *argvars, typval_T *rettv, int comp)
varnumber_T utf16idx = false;
if (argvars[2].v_type != VAR_UNKNOWN) {
utf16idx = tv_get_bool(&argvars[2]);
bool error = false;
utf16idx = tv_get_bool_chk(&argvars[2], &error);
if (error) {
return;
}
if (utf16idx < 0 || utf16idx > 1) {
if (utf16idx != -1) {
semsg(_(e_using_number_as_bool_nr), utf16idx);
}
semsg(_(e_using_number_as_bool_nr), utf16idx);
return;
}
}
@@ -1767,18 +1769,21 @@ void f_strcharlen(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
/// "strchars()" function
void f_strchars(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{
int skipcc = false;
varnumber_T skipcc = false;
if (argvars[1].v_type != VAR_UNKNOWN) {
skipcc = (int)tv_get_bool(&argvars[1]);
}
if (skipcc < 0 || skipcc > 1) {
if (skipcc != -1) {
semsg(_(e_using_number_as_bool_nr), skipcc);
bool error = false;
skipcc = tv_get_bool_chk(&argvars[1], &error);
if (error) {
return;
}
if (skipcc < 0 || skipcc > 1) {
semsg(_(e_using_number_as_bool_nr), skipcc);
return;
}
} else {
strchar_common(argvars, rettv, skipcc);
}
strchar_common(argvars, rettv, skipcc);
}
/// "strutf16len()" function
@@ -1845,11 +1850,12 @@ void f_strcharpart(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
if (!error) {
if (argvars[2].v_type != VAR_UNKNOWN
&& argvars[3].v_type != VAR_UNKNOWN) {
skipcc = tv_get_bool(&argvars[3]);
skipcc = tv_get_bool_chk(&argvars[3], &error);
if (error) {
return;
}
if (skipcc < 0 || skipcc > 1) {
if (skipcc != -1) {
semsg(_(e_using_number_as_bool_nr), skipcc);
}
semsg(_(e_using_number_as_bool_nr), skipcc);
return;
}
}