aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.2050: Vim9: crash with deferred function call and exception

Browse Source 
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>
This commit is contained in:
Yegappan Lakshmanan
2023-10-19 10:52:34 +02:00
committed by Christian Brabandt
parent d7b616d0ad
commit c59c1e0d88
8 changed files with 106 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vim9execute.c
View File

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