diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2023-10-19 10:52:34 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-10-19 10:52:34 +0200 |
| commit | c59c1e0d88651a71ece7366e418f1253abbe2a28 (patch) | |
| tree | 98453e9da10f027b806d3c3cf2cd524df85241c5 /src/ex_eval.c | |
| parent | d7b616d0ad006db06140729313b6217677cc4e80 (diff) | |
patch 9.0.2050: Vim9: crash with deferred function call and exceptionv9.0.2050
Problem: Vim9: crash with deferred function call and exception
Solution: Save and restore exception state
Crash when a deferred function is called after an exception and another
exception is thrown
closes: #13376
closes: #13377
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Diffstat (limited to 'src/ex_eval.c')
| -rw-r--r-- | src/ex_eval.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index 68dc6d78ca..e319dee0f0 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -748,6 +748,43 @@ finish_exception(except_T *excp) } /* + * Save the current exception state in "estate" + */ + void +exception_state_save(exception_state_T *estate) +{ + estate->estate_current_exception = current_exception; + estate->estate_did_throw = did_throw; + estate->estate_need_rethrow = need_rethrow; + estate->estate_trylevel = trylevel; +} + +/* + * Restore the current exception state from "estate" + */ + void +exception_state_restore(exception_state_T *estate) +{ + if (current_exception == NULL) + current_exception = estate->estate_current_exception; + did_throw |= estate->estate_did_throw; + need_rethrow |= estate->estate_need_rethrow; + trylevel |= estate->estate_trylevel; +} + +/* + * Clear the current exception state + */ + void +exception_state_clear(void) +{ + current_exception = NULL; + did_throw = FALSE; + need_rethrow = FALSE; + trylevel = 0; +} + +/* * Flags specifying the message displayed by report_pending. */ #define RP_MAKE 0 |