changeset 22543:1722ed01c729 v8.2.1820

patch 8.2.1820: Vim9: crash when error happens in timer callback Commit: https://github.com/vim/vim/commit/820d55a50bbc8c0ad0505b7e4302a734896b6bab Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 10 15:05:23 2020 +0200 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 https://github.com/vim/vim/issues/7100)
author Bram Moolenaar <Bram@vim.org>
date Sat, 10 Oct 2020 15:15:04 +0200
parents 11d166f7a958
children beaa663bf63c
files src/ex_docmd.c src/version.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 */
 /**/
+    1820,
+/**/
     1819,
 /**/
     1818,