From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 10 Oct 2020 13:05:23 +0000 (+0200)
Subject: patch 8.2.1820: Vim9: crash when error happens in timer callback
X-Git-Tag: v8.2.1820
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=820d55a50bbc8c0ad0505b7e4302a734896b6bab;p=thirdparty%2Fvim.git

patch 8.2.1820: Vim9: crash when error happens in timer callback

Problem:    Vim9: crash when error happens in timer callback.
Solution:   Check that current_exception is not NULL. (closes #7100)
---

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 05378fdcd7..310934ed71 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1234,6 +1234,10 @@ do_cmdline(
 
     if (trylevel == 0)
     {
+	// Just in case did_throw got set but current_exception wasn't.
+	if (current_exception == NULL)
+	    did_throw = FALSE;
+
 	/*
 	 * When an exception is being thrown out of the outermost try
 	 * conditional, discard the uncaught exception, disable the conversion
diff --git a/src/version.c b/src/version.c
index a953c099b8..8e2115e5d3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1820,
 /**/
     1819,
 /**/