aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00
Code Activity

patch 8.1.0112: no error when using bad arguments with searchpair()

Browse Source 
Problem:    No error when using bad arguments with searchpair().
Solution:   Add error messages.
This commit is contained in:
Bram Moolenaar
2018-06-24 19:01:59 +02:00
parent d1d037e901
commit 3dddb09c98
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/evalfunc.c
View File

@@ -10152,7 +10152,8 @@ searchpair_cmn(typval_T *argvars, pos_T *match_pos)
long lnum_stop = 0;
long time_limit = 0;
/* Get the three pattern arguments: start, middle, end. */
/* Get the three pattern arguments: start, middle, end. Will result in an
* error if not a valid argument. */
spat = get_tv_string_chk(&argvars[0]);
mpat = get_tv_string_buf_chk(&argvars[1], nbuf1);
epat = get_tv_string_buf_chk(&argvars[2], nbuf2);
@@ -10189,19 +10190,26 @@ searchpair_cmn(typval_T *argvars, pos_T *match_pos)
&& skip->v_type != VAR_STRING)
{
/* Type error */
EMSG2(_(e_invarg2), get_tv_string(&argvars[4]));
goto theend;
}
if (argvars[5].v_type != VAR_UNKNOWN)
{
lnum_stop = (long)get_tv_number_chk(&argvars[5], NULL);
if (lnum_stop < 0)
{
EMSG2(_(e_invarg2), get_tv_string(&argvars[5]));
goto theend;
}
#ifdef FEAT_RELTIME
if (argvars[6].v_type != VAR_UNKNOWN)
{
time_limit = (long)get_tv_number_chk(&argvars[6], NULL);
if (time_limit < 0)
{
EMSG2(_(e_invarg2), get_tv_string(&argvars[6]));
goto theend;
}
}
#endif
}