thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2857: Vim9: exception in ISN_INSTR caught at wrong level

Browse Source 
Problem:    Vim9: exception in ISN_INSTR caught at wrong level.
Solution:   Set the starting trylevel in exec_instructions(). (closes #8214)
This commit is contained in:
Bram Moolenaar
2021-05-16 15:24:49 +02:00
parent 3ec3217f04
commit ff65288aa8
5 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/globals.h
View File

@@ -1616,7 +1616,7 @@ EXTERN char e_duparg2[] INIT(= N_("E983: Duplicate argument: %s"));
EXTERN char e_invargval[] INIT(= N_("E475: Invalid value for argument %s"));
EXTERN char e_invargNval[] INIT(= N_("E475: Invalid value for argument %s: %s"));
#ifdef FEAT_EVAL
EXTERN char e_invexpr2[] INIT(= N_("E15: Invalid expression: %s"));
EXTERN char e_invexpr2[] INIT(= N_("E15: Invalid expression: \"%s\""));
#endif
EXTERN char e_invrange[] INIT(= N_("E16: Invalid range"));
#if defined(UNIX) || defined(FEAT_SYN_HL) || defined(FEAT_SPELL)

14
src/testdir/test_vim9_builtin.vim
View File

@@ -1006,6 +1006,20 @@ def Test_searchpair()
normal 0f{
assert_equal([0, 0], searchpairpos('{', '', '}', '', 'col(".") > col'))
var lines =<< trim END
vim9script
setline(1, '()')
normal gg
def Fail()
try
searchpairpos('(', '', ')', 'nW', '[0]->map("")')
catch
endtry
enddef
Fail()
END
CheckScriptFailure(lines, 'E15:')
bwipe!
enddef

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2857,
/**/
2856,
/**/

5
src/vim9compile.c
View File

@@ -3131,7 +3131,8 @@ compile_string(isn_T *isn, cctx_T *cctx)
s = skipwhite(s);
trailing_error = *s != NUL;
if (expr_res == FAIL || trailing_error)
if (expr_res == FAIL || trailing_error
|| ga_grow(&cctx->ctx_instr, 1) == FAIL)
{
if (trailing_error)
semsg(_(e_trailing_arg), s);
@@ -3185,7 +3186,7 @@ compile_arguments(char_u **arg, cctx_T *cctx, int *argcount, int is_searchpair)
return FAIL;
++*argcount;
if (is_searchpair && *argcount == 5
if (is_searchpair && *argcount >= 5
&& cctx->ctx_instr.ga_len == instr_count + 1)
{
isn_T *isn = ((isn_T *)cctx->ctx_instr.ga_data) + instr_count;

4
src/vim9execute.c
View File

@@ -1295,6 +1295,9 @@ exec_instructions(ectx_T *ectx)
// Start execution at the first instruction.
ectx->ec_iidx = 0;
// Only catch exceptions in this instruction list.
ectx->ec_trylevel_at_start = trylevel;
for (;;)
{
isn_T *iptr;
@@ -4158,7 +4161,6 @@ call_def_function(
ga_init2(&ectx.ec_trystack, sizeof(trycmd_T), 10);
ga_init2(&ectx.ec_funcrefs, sizeof(partial_T *), 10);
ectx.ec_did_emsg_before = did_emsg_before;
ectx.ec_trylevel_at_start = trylevel;
idx = argc - ufunc->uf_args.ga_len;
if (idx > 0 && ufunc->uf_va_name == NULL)