# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1633429804 -7200
# Node ID c83ebae4588181bd4520213abc1a72690e007474
# Parent  87ef006b26d4a21dafe28248e4cc257ae1ed4352
patch 8.2.3478: still crash with error in :catch and also in :finally

Commit: https://github.com/vim/vim/commit/f67d3fb7363ebc9454f9bb582de3978609a4fd6b
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Oct 5 11:22:27 2021 +0100

    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 https://github.com/vim/vim/issues/8954)

diff --git a/src/ex_eval.c b/src/ex_eval.c
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -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
diff --git a/src/structs.h b/src/structs.h
--- a/src/structs.h
+++ b/src/structs.h
@@ -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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3478,
+/**/
     3477,
 /**/
     3476,