# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1499717703 -7200
# Node ID 50f2a4ad1cfab69c9054371edcd65740b5d31d9e
# Parent  da9c50ac83914b1cbd3a6b38247a8ed980d6708e
patch 8.0.0705: crash when there is an error in a timer callback

commit https://github.com/vim/vim/commit/cae24be4a808d60313913cc6feea6c2bee2e2a42
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Jul 10 22:12:10 2017 +0200

    patch 8.0.0705: crash when there is an error in a timer callback

    Problem:    Crash when there is an error in a timer callback. (Aron Griffis,
                Ozaki Kiichi)
    Solution:   Check did_throw before discarding an exception.  NULLify
                current_exception when no longer valid.

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1235,7 +1235,7 @@ check_due_timer(void)
 	    if (called_emsg)
 	    {
 		++timer->tr_emsg_count;
-		if (!did_throw_save && current_exception != NULL)
+		if (!did_throw_save && did_throw && current_exception != NULL)
 		    discard_current_exception();
 	    }
 	    did_emsg = did_emsg_save;
diff --git a/src/ex_eval.c b/src/ex_eval.c
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -640,8 +640,11 @@ discard_exception(except_T *excp, int wa
     void
 discard_current_exception(void)
 {
-    discard_exception(current_exception, FALSE);
-    current_exception = NULL;
+    if (current_exception != NULL)
+    {
+	discard_exception(current_exception, FALSE);
+	current_exception = NULL;
+    }
     did_throw = FALSE;
     need_rethrow = FALSE;
 }
@@ -1978,7 +1981,10 @@ enter_cleanup(cleanup_T *csp)
 	 * there is an extra instance for every call of do_cmdline(), anyway.
 	 */
 	if (did_throw || need_rethrow)
+	{
 	    csp->exception = current_exception;
+	    current_exception = NULL;
+	}
 	else
 	{
 	    csp->exception = NULL;
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    705,
+/**/
     704,
 /**/
     703,