Mercurial > vim
diff src/evalfunc.c @ 14189:0181a2cad0a1 v8.1.0112
patch 8.1.0112: no error when using bad arguments with searchpair()
commit https://github.com/vim/vim/commit/3dddb09c98825acefa6f2d94bb369b8e00d7b3e5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 24 19:01:59 2018 +0200
patch 8.1.0112: no error when using bad arguments with searchpair()
Problem: No error when using bad arguments with searchpair().
Solution: Add error messages.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 24 Jun 2018 19:15:06 +0200 |
| parents | 2ad722003b36 |
| children | 68166b841ee9 |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -10152,7 +10152,8 @@ searchpair_cmn(typval_T *argvars, pos_T 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 && 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 }