# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1608397204 -3600
# Node ID 22037d6da577cdce3e07320f1fff18a214ae145e
# Parent  802307c90329e8e424c5e4557241b9ad57ca3bca
patch 8.2.2163: crash when discarded exception is the current exception

Commit: https://github.com/vim/vim/commit/13656f02e457fb68cd7e72412fc24ccac02fb06e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Dec 19 17:55:54 2020 +0100

    patch 8.2.2163: crash when discarded exception is the current exception

    Problem:    Crash when discarded exception is the current exception.
    Solution:   Compare the execption with current_exception. (closes https://github.com/vim/vim/issues/7499)

diff --git a/src/ex_eval.c b/src/ex_eval.c
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -606,6 +606,8 @@ discard_exception(except_T *excp, int wa
 {
     char_u		*saved_IObuff;
 
+    if (current_exception == excp)
+	current_exception = NULL;
     if (excp == NULL)
     {
 	internal_error("discard_exception()");
@@ -654,10 +656,7 @@ discard_exception(except_T *excp, int wa
 discard_current_exception(void)
 {
     if (current_exception != NULL)
-    {
 	discard_exception(current_exception, FALSE);
-	current_exception = NULL;
-    }
     did_throw = FALSE;
     need_rethrow = FALSE;
 }
@@ -2284,8 +2283,8 @@ cleanup_conditionals(
 				// Cancel the pending exception.  This is in the
 				// finally clause, so that the stack of the
 				// caught exceptions is not involved.
-				discard_exception((except_T *)
-					cstack->cs_exception[idx],
+				discard_exception(
+					(except_T *)cstack->cs_exception[idx],
 					FALSE);
 			    }
 			    else
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2163,
+/**/
     2162,
 /**/
     2161,