mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-16 15:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.2050: Vim9: crash with deferred function call and exception (#25715)

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: vim/vim#13376
closes: vim/vim#13377

c59c1e0d88

The change in check_due_timer() is N/A as Nvim calls timer callbacks on
the main loop.

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
zeertzjq
2023-10-19 18:34:48 +08:00
committed by GitHub
parent ae7020c667
commit a096165977
4 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/eval/userfunc.c
View File

@@ -3297,21 +3297,16 @@ static void handle_defer_one(funccall_T *funccal)
dr->dr_name = 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.
const int save_trylevel = trylevel;
const bool save_did_throw = did_throw;
const bool 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();
call_func(name, -1, &rettv, dr->dr_argcount, dr->dr_argvars, &funcexe);
trylevel = save_trylevel;
did_throw = save_did_throw;
need_rethrow = save_need_rethrow;
exception_state_restore(&estate);
tv_clear(&rettv);
xfree(name);