patch 8.2.3478: still crash with error in :catch and also in :finally
Problem: Still crash with error in :catch and also in :finally.
Solution: Only call finish_exception() once. (closes #8954)
diff --git a/src/ex_eval.c b/src/ex_eval.c
index 503a3ae..ee6816a 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -2401,8 +2401,12 @@
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
diff --git a/src/structs.h b/src/structs.h
index eae6cd9..b5889b7 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -943,11 +943,12 @@
# 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
diff --git a/src/version.c b/src/version.c
index e65eb8c..fa64466 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3478,
+/**/
3477,
/**/
3476,