aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.2330: Vim9: crash when using :trow in a not executed block

Browse Source 
Problem:    Vim9: crash when using :trow in a not executed block.
Solution:   Don't generate the instruction when skipping. (closes #7659)
This commit is contained in:
Bram Moolenaar
2021-01-11 20:17:34 +01:00
parent df4c9af7e7
commit 9e1d9e3473
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_vim9_script.vim
View File

@@ -324,7 +324,7 @@ func g:NoSuchFunc()
echo 'none' echo 'none'
endfunc endfunc
def Test_try_catch() def Test_try_catch_throw()
var l = [] var l = []
try # comment try # comment
add(l, '1') add(l, '1')
@@ -558,6 +558,12 @@ def Test_try_catch()
assert_equal(411, n) assert_equal(411, n)
enddef enddef
def Test_throw_skipped()
if 0
throw dontgethere
endif
enddef
def DeletedFunc(): list<any> def DeletedFunc(): list<any>
return ['delete me'] return ['delete me']
enddef enddef

2
src/version.c
View File

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

6
src/vim9compile.c
View File

@@ -474,8 +474,10 @@ may_generate_2STRING(int offset, cctx_T *cctx)
isn_T *isn; isn_T *isn;
isntype_T isntype = ISN_2STRING; isntype_T isntype = ISN_2STRING;
garray_T *stack = &cctx->ctx_type_stack; garray_T *stack = &cctx->ctx_type_stack;
type_T **type = ((type_T **)stack->ga_data) + stack->ga_len + offset; type_T **type;
RETURN_OK_IF_SKIP(cctx);
type = ((type_T **)stack->ga_data) + stack->ga_len + offset;
switch ((*type)->tt_type) switch ((*type)->tt_type)
{ {
// nothing to be done // nothing to be done
@@ -7461,6 +7463,8 @@ compile_throw(char_u *arg, cctx_T *cctx UNUSED)
if (compile_expr0(&p, cctx) == FAIL) if (compile_expr0(&p, cctx) == FAIL)
return NULL; return NULL;
if (cctx->ctx_skip == SKIP_YES)
return p;
if (may_generate_2STRING(-1, cctx) == FAIL) if (may_generate_2STRING(-1, cctx) == FAIL)
return NULL; return NULL;
if (generate_instr_drop(cctx, ISN_THROW, 1) == NULL) if (generate_instr_drop(cctx, ISN_THROW, 1) == NULL)