diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-10 22:12:10 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-10 22:12:10 +0200 |
| commit | cae24be4a808d60313913cc6feea6c2bee2e2a42 (patch) | |
| tree | 5759bd8d564c2160ac7ab204cc3da7cc9ed32ba9 /src/ex_eval.c | |
| parent | 163095f088a7c29710a16c75bb56229dd3b4116a (diff) | |
| download | vim-cae24be4a808d60313913cc6feea6c2bee2e2a42.zip | |
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.
Diffstat (limited to 'src/ex_eval.c')
| -rw-r--r-- | src/ex_eval.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index 17e0fdb52..f209c5f95 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -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; |