0
0
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00

patch 8.2.3076: Vim9: using try in catch block causes a hang

Problem:    Vim9: using try in catch block causes a hang.
Solution:   Save and restore the ec_in_catch flag. (closes #8478)
This commit is contained in:
Bram Moolenaar
2021-06-30 12:02:24 +02:00
parent 80b2ba3e96
commit 3f987b5917
3 changed files with 32 additions and 1 deletions

View File

@@ -605,6 +605,32 @@ def Test_try_catch_throw()
unlet g:caught unlet g:caught
enddef enddef
def Test_try_in_catch()
var lines =<< trim END
vim9script
var seq = []
def DoIt()
try
seq->add('throw 1')
eval [][0]
seq->add('notreached')
catch
seq->add('catch')
try
seq->add('throw 2')
eval [][0]
seq->add('notreached')
catch /nothing/
seq->add('notreached')
endtry
seq->add('done')
endtry
enddef
DoIt()
assert_equal(['throw 1', 'catch', 'throw 2', 'done'], seq)
END
enddef
" :while at the very start of a function that :continue jumps to " :while at the very start of a function that :continue jumps to
def TryContinueFunc() def TryContinueFunc()
while g:Count < 2 while g:Count < 2

View File

@@ -755,6 +755,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 */
/**/
3076,
/**/ /**/
3075, 3075,
/**/ /**/

View File

@@ -26,6 +26,7 @@
typedef struct { typedef struct {
int tcd_frame_idx; // ec_frame_idx at ISN_TRY int tcd_frame_idx; // ec_frame_idx at ISN_TRY
int tcd_stack_len; // size of ectx.ec_stack at ISN_TRY int tcd_stack_len; // size of ectx.ec_stack at ISN_TRY
int tcd_save_in_catch; // saved ec_in_catch
int tcd_catch_idx; // instruction of the first :catch or :finally int tcd_catch_idx; // instruction of the first :catch or :finally
int tcd_finally_idx; // instruction of the :finally block or zero int tcd_finally_idx; // instruction of the :finally block or zero
int tcd_endtry_idx; // instruction of the :endtry int tcd_endtry_idx; // instruction of the :endtry
@@ -3166,6 +3167,8 @@ exec_instructions(ectx_T *ectx)
CLEAR_POINTER(trycmd); CLEAR_POINTER(trycmd);
trycmd->tcd_frame_idx = ectx->ec_frame_idx; trycmd->tcd_frame_idx = ectx->ec_frame_idx;
trycmd->tcd_stack_len = ectx->ec_stack.ga_len; trycmd->tcd_stack_len = ectx->ec_stack.ga_len;
trycmd->tcd_save_in_catch = ectx->ec_in_catch;
ectx->ec_in_catch = FALSE;
trycmd->tcd_catch_idx = trycmd->tcd_catch_idx =
iptr->isn_arg.try.try_ref->try_catch; iptr->isn_arg.try.try_ref->try_catch;
trycmd->tcd_finally_idx = trycmd->tcd_finally_idx =
@@ -3263,9 +3266,9 @@ exec_instructions(ectx_T *ectx)
--trystack->ga_len; --trystack->ga_len;
--trylevel; --trylevel;
ectx->ec_in_catch = FALSE;
trycmd = ((trycmd_T *)trystack->ga_data) trycmd = ((trycmd_T *)trystack->ga_data)
+ trystack->ga_len; + trystack->ga_len;
ectx->ec_in_catch = trycmd->tcd_save_in_catch;
if (trycmd->tcd_caught && current_exception != NULL) if (trycmd->tcd_caught && current_exception != NULL)
{ {
// discard the exception // discard the exception