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/vim9execute.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/vim9execute.c')
-rw-r--r-- | src/vim9execute.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/vim9execute.c b/src/vim9execute.c index dd3d263b52..a6bf4715a8 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -1141,21 +1141,16 @@ invoke_defer_funcs(ectx_T *ectx) functv->vval.v_string = NULL; // If the deferred function is called after an exception, then only the - // first statement in the function will be executed. Save and restore - // the try/catch/throw exception state. - int save_trylevel = trylevel; - int save_did_throw = did_throw; - int save_need_rethrow = need_rethrow; - - trylevel = 0; - did_throw = FALSE; - need_rethrow = FALSE; + // first statement in the function will be executed (because of the + // exception). So save and restore the try/catch/throw exception + // state. + exception_state_T estate; + exception_state_save(&estate); + exception_state_clear(); (void)call_func(name, -1, &rettv, argcount, argvars, &funcexe); - trylevel = save_trylevel; - did_throw = save_did_throw; - need_rethrow = save_need_rethrow; + exception_state_restore(&estate); clear_tv(&rettv); vim_free(name); |