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.2543: Vim9: a return inside try/catch does not restore properly

Browse Source 
Problem:    Vim9: a return inside try/catch does not restore exception state
            properly.
Solution:   When there is no ":finally" jump to ":endtry". (closes #7882)
This commit is contained in:
Bram Moolenaar
2021-02-22 22:45:10 +01:00
parent 41f0895c6e
commit 9cb577a682
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vim9execute.c
View File

@@ -2517,11 +2517,13 @@ call_def_function(
trycmd = ((trycmd_T *)trystack->ga_data)
+ trystack->ga_len - 1;
if (trycmd != NULL
&& trycmd->tcd_frame_idx == ectx.ec_frame_idx
&& trycmd->tcd_finally_idx != 0)
&& trycmd->tcd_frame_idx == ectx.ec_frame_idx)
{
// jump to ":finally" once
ectx.ec_iidx = trycmd->tcd_finally_idx;
// jump to ":finally" or ":endtry"
if (trycmd->tcd_finally_idx != 0)
ectx.ec_iidx = trycmd->tcd_finally_idx;
else
ectx.ec_iidx = trycmd->tcd_endtry_idx;
trycmd->tcd_return = TRUE;
}
else