# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1633370406 -7200
# Node ID a58520ab7c3b040dd42c59418be9e042392b4b6b
# Parent  8a00c3caf60d5935cc2d1d3c8d08e2ec4b41711a
patch 8.2.3470: crash with error in :catch and also in :finally

Commit: https://github.com/vim/vim/commit/a684a684096ecef3fbaee39c573b47423235d6b1
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Oct 4 18:52:19 2021 +0100

    patch 8.2.3470: crash with error in :catch and also in :finally

    Problem:    Crash with error in :catch and also in :finally.
    Solution:   Only discard an exception if there is one. (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
@@ -2374,7 +2374,8 @@ cleanup_conditionals(
 		    default:
 			if (cstack->cs_flags[idx] & CSF_FINALLY)
 			{
-			    if (cstack->cs_pending[idx] & CSTP_THROW)
+			    if ((cstack->cs_pending[idx] & CSTP_THROW)
+				    && cstack->cs_exception[idx] != NULL)
 			    {
 				// Cancel the pending exception.  This is in the
 				// finally clause, so that the stack of the
diff --git a/src/testdir/test_trycatch.vim b/src/testdir/test_trycatch.vim
--- a/src/testdir/test_trycatch.vim
+++ b/src/testdir/test_trycatch.vim
@@ -2273,6 +2273,18 @@ func Test_user_command_function_call_wit
   call delete('XtestThrow')
 endfunc
 
+func ThisWillFail()
+  try
+    if x | endif
+  catch
+    for l in []
+  finally 
+endfunc
+
+func Test_error_in_catch_and_finally()
+  call assert_fails('call ThisWillFail()', ['E121:', 'E600:'])
+endfunc
+
 
 " Modeline								    {{{1
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
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 */
 /**/
+    3470,
+/**/
     3469,
 /**/
     3468,