From ece0b87c0fb0e35ff4c51f9ba81389f56428e42b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 8 Jan 2021 20:40:45 +0100 Subject: [PATCH] patch 8.2.2313: Vim9: using uninitialized field when parsing range 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) --- src/testdir/test_vim9_cmd.vim | 6 ++++++ src/version.c | 2 ++ src/vim9execute.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index 5b84feceea..f5cb1c8739 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 9604650963..9e49e6ddaa 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2313, /**/ 2312, /**/ diff --git a/src/vim9execute.c b/src/vim9execute.c index 1376148228..44180b8f19 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 -- 2.47.2