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.3478: still crash with error in :catch and also in :finally

Browse Source 
Problem:    Still crash with error in :catch and also in :finally.
Solution:   Only call finish_exception() once. (closes #8954)
This commit is contained in:
Bram Moolenaar
2021-10-05 11:22:27 +01:00
parent 6d19798774
commit f67d3fb736
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ex_eval.c
View File

@@ -2401,8 +2401,12 @@ cleanup_conditionals(
if (!(cstack->cs_flags[idx] & CSF_FINALLY))
{
if ((cstack->cs_flags[idx] & CSF_ACTIVE)
&& (cstack->cs_flags[idx] & CSF_CAUGHT))
&& (cstack->cs_flags[idx] & CSF_CAUGHT)
&& !(cstack->cs_flags[idx] & CSF_FINISHED))
{
finish_exception((except_T *)cstack->cs_exception[idx]);
cstack->cs_flags[idx] |= CSF_FINISHED;
}
// Stop at this try conditional - except the try block never
// got active (because of an inactive surrounding conditional
// or when the ":try" appeared after an error or interrupt or

7
src/structs.h
View File

@@ -943,11 +943,12 @@ typedef struct {
# define CSF_CATCH 0x0400 // ":catch" has been seen
# define CSF_THROWN 0x0800 // exception thrown to this try conditional
# define CSF_CAUGHT 0x1000 // exception caught by this try conditional
# define CSF_SILENT 0x2000 // "emsg_silent" reset by ":try"
# define CSF_FINISHED 0x2000 // CSF_CAUGHT was handled by finish_exception()
# define CSF_SILENT 0x4000 // "emsg_silent" reset by ":try"
// Note that CSF_ELSE is only used when CSF_TRY and CSF_WHILE are unset
// (an ":if"), and CSF_SILENT is only used when CSF_TRY is set.
//
#define CSF_FUNC_DEF 0x4000 // a function was defined in this block
# define CSF_FUNC_DEF 0x8000 // a function was defined in this block
/*
* What's pending for being reactivated at the ":endtry" of this try

2
src/version.c
View File

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