Permalink
Browse files

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.
  • Loading branch information...
brammool committed Jul 10, 2017
1 parent 163095f commit cae24be4a808d60313913cc6feea6c2bee2e2a42
Showing with 11 additions and 3 deletions.
  1. +1 −1 src/ex_cmds2.c
  2. +8 −2 src/ex_eval.c
  3. +2 −0 src/version.c
View
@@ -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;
View
@@ -640,8 +640,11 @@ discard_exception(except_T *excp, int was_finished)
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;
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
705,
/**/
704,
/**/

0 comments on commit cae24be

Please sign in to comment.