mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 9.0.1524: passing -1 for bool is not always rejected
Problem: Passing -1 for bool is not always rejected. Solution: Check for error in a better way. (closes #12358)
This commit is contained in:
parent
276410e78f
commit
8cf51376b8
@ -1065,11 +1065,13 @@ byteidx_common(typval_T *argvars, typval_T *rettv, int comp UNUSED)
|
|||||||
varnumber_T utf16idx = FALSE;
|
varnumber_T utf16idx = FALSE;
|
||||||
if (argvars[2].v_type != VAR_UNKNOWN)
|
if (argvars[2].v_type != VAR_UNKNOWN)
|
||||||
{
|
{
|
||||||
utf16idx = tv_get_bool(&argvars[2]);
|
int error = FALSE;
|
||||||
|
utf16idx = tv_get_bool_chk(&argvars[2], &error);
|
||||||
|
if (error)
|
||||||
|
return;
|
||||||
if (utf16idx < 0 || utf16idx > 1)
|
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;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1421,14 +1423,19 @@ f_strchars(typval_T *argvars, typval_T *rettv)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (argvars[1].v_type != VAR_UNKNOWN)
|
if (argvars[1].v_type != VAR_UNKNOWN)
|
||||||
skipcc = tv_get_bool(&argvars[1]);
|
|
||||||
if (skipcc < 0 || skipcc > 1)
|
|
||||||
{
|
{
|
||||||
if (skipcc != -1)
|
int 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);
|
semsg(_(e_using_number_as_bool_nr), skipcc);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
strchar_common(argvars, rettv, skipcc);
|
strchar_common(argvars, rettv, skipcc);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1533,11 +1540,12 @@ f_strcharpart(typval_T *argvars, typval_T *rettv)
|
|||||||
if (argvars[2].v_type != VAR_UNKNOWN
|
if (argvars[2].v_type != VAR_UNKNOWN
|
||||||
&& argvars[3].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 < 0 || skipcc > 1)
|
||||||
{
|
{
|
||||||
if (skipcc != -1)
|
semsg(_(e_using_number_as_bool_nr), skipcc);
|
||||||
semsg(_(e_using_number_as_bool_nr), skipcc);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -161,7 +161,8 @@ func Test_strcharpart()
|
|||||||
END
|
END
|
||||||
call v9.CheckLegacyAndVim9Success(lines)
|
call v9.CheckLegacyAndVim9Success(lines)
|
||||||
|
|
||||||
call assert_fails('echo strcharpart("", 0, 0, {})', ['E728:', 'E728:'])
|
call assert_fails('call strcharpart("", 0, 0, {})', ['E728:', 'E728:'])
|
||||||
|
call assert_fails('call strcharpart("", 0, 0, -1)', ['E1023:', 'E1023:'])
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_getreg_empty_list()
|
func Test_getreg_empty_list()
|
||||||
|
@ -1225,6 +1225,7 @@ func Test_byteidx()
|
|||||||
call assert_fails("call byteidx([], 0)", 'E730:')
|
call assert_fails("call byteidx([], 0)", 'E730:')
|
||||||
call assert_fails("call byteidx('abc', [])", 'E745:')
|
call assert_fails("call byteidx('abc', [])", 'E745:')
|
||||||
call assert_fails("call byteidx('abc', 0, {})", ['E728:', 'E728:'])
|
call assert_fails("call byteidx('abc', 0, {})", ['E728:', 'E728:'])
|
||||||
|
call assert_fails("call byteidx('abc', 0, -1)", ['E1023:', 'E1023:'])
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
" Test for byteidxcomp() using a character index
|
" Test for byteidxcomp() using a character index
|
||||||
@ -1265,6 +1266,7 @@ func Test_byteidxcomp()
|
|||||||
call assert_fails("call byteidxcomp([], 0)", 'E730:')
|
call assert_fails("call byteidxcomp([], 0)", 'E730:')
|
||||||
call assert_fails("call byteidxcomp('abc', [])", 'E745:')
|
call assert_fails("call byteidxcomp('abc', [])", 'E745:')
|
||||||
call assert_fails("call byteidxcomp('abc', 0, {})", ['E728:', 'E728:'])
|
call assert_fails("call byteidxcomp('abc', 0, {})", ['E728:', 'E728:'])
|
||||||
|
call assert_fails("call byteidxcomp('abc', 0, -1)", ['E1023:', 'E1023:'])
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
" Test for byteidx() using a UTF-16 index
|
" Test for byteidx() using a UTF-16 index
|
||||||
@ -1625,7 +1627,6 @@ func Test_utf16idx_from_charidx()
|
|||||||
" error cases
|
" error cases
|
||||||
call assert_equal(-1, utf16idx(test_null_string(), 0, v:true, v:true))
|
call assert_equal(-1, utf16idx(test_null_string(), 0, v:true, v:true))
|
||||||
call assert_fails('let l = utf16idx("ab", 0, v:false, [])', 'E1212:')
|
call assert_fails('let l = utf16idx("ab", 0, v:false, [])', 'E1212:')
|
||||||
call assert_fails('echo strchars("", {})', ['E728:', 'E728:'])
|
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
" Test for strutf16len()
|
" Test for strutf16len()
|
||||||
|
@ -29,8 +29,10 @@ func Test_strchars()
|
|||||||
call assert_equal(exp[i], strcharlen(inp[i]))
|
call assert_equal(exp[i], strcharlen(inp[i]))
|
||||||
endfor
|
endfor
|
||||||
|
|
||||||
call assert_fails("let v=strchars('abc', [])", 'E745:')
|
call assert_fails("call strchars('abc', 2)", ['E1023:', 'E1023:'])
|
||||||
call assert_fails("let v=strchars('abc', 2)", 'E1023:')
|
call assert_fails("call strchars('abc', -1)", ['E1023:', 'E1023:'])
|
||||||
|
call assert_fails("call strchars('abc', {})", ['E728:', 'E728:'])
|
||||||
|
call assert_fails("call strchars('abc', [])", ['E745:', 'E745:'])
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
" Test for customlist completion
|
" Test for customlist completion
|
||||||
|
@ -695,6 +695,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1524,
|
||||||
/**/
|
/**/
|
||||||
1523,
|
1523,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user