0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

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.
This commit is contained in:
Bram Moolenaar
2017-07-10 22:12:10 +02:00
parent 163095f088
commit cae24be4a8
3 changed files with 11 additions and 3 deletions

View File

@@ -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;