diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-21 07:38:43 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-23 18:17:08 -0400 |
| commit | efdc0f6a6949ec9bfb0d9ef454871458489773f0 (patch) | |
| tree | b68e439981c1b1acf2a507cb504678fd1db3750a /src/nvim/eval.c | |
| parent | 8bc365c886ecd9ba502dc0d4a7b46ec9bc92387d (diff) | |
| download | rneovim-efdc0f6a6949ec9bfb0d9ef454871458489773f0.tar.gz rneovim-efdc0f6a6949ec9bfb0d9ef454871458489773f0.tar.bz2 rneovim-efdc0f6a6949ec9bfb0d9ef454871458489773f0.zip | |
vim-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.
https://github.com/vim/vim/commit/3dddb09c98825acefa6f2d94bb369b8e00d7b3e5
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 05f001496a..6c138729a2 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -14527,7 +14527,8 @@ static int 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. char nbuf1[NUMBUFLEN]; char nbuf2[NUMBUFLEN]; const char *spat = tv_get_string_chk(&argvars[0]); @@ -14566,16 +14567,19 @@ static int searchpair_cmn(typval_T *argvars, pos_T *match_pos) if (skip->v_type != VAR_FUNC && skip->v_type != VAR_PARTIAL && skip->v_type != VAR_STRING) { + emsgf(_(e_invarg2), tv_get_string(&argvars[4])); goto theend; // Type error. } if (argvars[5].v_type != VAR_UNKNOWN) { lnum_stop = tv_get_number_chk(&argvars[5], NULL); if (lnum_stop < 0) { + emsgf(_(e_invarg2), tv_get_string(&argvars[5])); goto theend; } if (argvars[6].v_type != VAR_UNKNOWN) { time_limit = tv_get_number_chk(&argvars[6], NULL); if (time_limit < 0) { + emsgf(_(e_invarg2), tv_get_string(&argvars[6])); goto theend; } } |