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

patch 8.2.4499: Vim9: at the script level declarations leak to next block

Browse Source 
Problem:    Vim9: at the script level declarations leak from try block to
            catch and finally block.
Solution:   End the block and start a new one. (closes #9883)
This commit is contained in:
Bram Moolenaar
2022-03-03 15:11:20 +00:00
parent 1fc34225ac
commit 28bf649a57
3 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ex_eval.c
View File

@@ -1827,6 +1827,16 @@ ex_catch(exarg_T *eap)
cstack->cs_flags[idx] |= CSF_ACTIVE | CSF_CAUGHT;
did_emsg = got_int = did_throw = FALSE;
catch_exception((except_T *)cstack->cs_exception[idx]);
if (cstack->cs_idx >= 0
&& (cstack->cs_flags[cstack->cs_idx] & CSF_TRY))
{
// Variables declared in the previous block can no longer be
// used.
leave_block(cstack);
enter_block(cstack);
}
// It's mandatory that the current exception is stored in the cstack
// so that it can be discarded at the next ":catch", ":finally", or
// ":endtry" or when the catch clause is left by a ":continue",
@@ -1930,6 +1940,15 @@ ex_finally(exarg_T *eap)
*/
cleanup_conditionals(cstack, CSF_TRY, FALSE);
if (cstack->cs_idx >= 0
&& (cstack->cs_flags[cstack->cs_idx] & CSF_TRY))
{
// Variables declared in the previous block can no longer be
// used.
leave_block(cstack);
enter_block(cstack);
}
/*
* Make did_emsg, got_int, did_throw pending. If set, they overrule
* a pending ":continue", ":break", ":return", or ":finish". Then