diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-01-08 20:40:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-01-08 20:40:45 +0100 |
| commit | ece0b87c0fb0e35ff4c51f9ba81389f56428e42b (patch) | |
| tree | 1e00375a149658cd077d0ce04d0faa90d6838805 | |
| parent | 467b59c2eb06f7fe6c2b5b677855cd422adbc45c (diff) | |
| download | vim-git-ece0b87c0fb0e35ff4c51f9ba81389f56428e42b.tar.gz | |
patch 8.2.2313: Vim9: using uninitialized field when parsing rangev8.2.2313
Problem: Vim9: using uninitialized field when parsing range. ":silent!" not
respected when parsing range fails.
Solution: Initialize ea.skip. On pattern failure handle it like an error.
(closes #7636)
| -rw-r--r-- | src/testdir/test_vim9_cmd.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9execute.c | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index 5b84fecee..f5cb1c873 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -661,6 +661,12 @@ def Test_range_after_command_modifier() bwipe! enddef +def Test_silent_pattern() + new + silent! :/pat/put _ + bwipe! +enddef + def Test_eval_command() var from = 3 var to = 5 diff --git a/src/version.c b/src/version.c index 960465096..9e49e6dda 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2313, +/**/ 2312, /**/ 2311, diff --git a/src/vim9execute.c b/src/vim9execute.c index 137614822..44180b8f1 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -3148,11 +3148,13 @@ call_def_function( goto failed; ++ectx.ec_stack.ga_len; tv = STACK_TV_BOT(-1); + ea.line2 = 0; ea.addr_count = 0; ea.addr_type = ADDR_LINES; ea.cmd = iptr->isn_arg.string; + ea.skip = FALSE; if (parse_cmd_address(&ea, &errormsg, FALSE) == FAIL) - goto failed; + goto on_error; if (ea.addr_count == 0) tv->vval.v_number = curwin->w_cursor.lnum; else |