diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-10 15:05:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-10 15:05:23 +0200 |
| commit | 820d55a50bbc8c0ad0505b7e4302a734896b6bab (patch) | |
| tree | 4345521c6ff56f9aa999e9bfb902a6bb73225266 /src | |
| parent | 85d5e2b723e6fc233e53252dd5c523944146fbc2 (diff) | |
patch 8.2.1820: Vim9: crash when error happens in timer callbackv8.2.1820
Problem: Vim9: crash when error happens in timer callback.
Solution: Check that current_exception is not NULL. (closes #7100)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_docmd.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1820, +/**/ 1819, /**/ 1818, |