IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3478: still crash with error in :catch and also in :finally

Browse Source 
Problem:    Still crash with error in :catch and also in :finally.
Solution:   Only call finish_exception() once. (closes vim/vim#8954)
f67d3fb736

Exclude CSF_FUNC_DEF change (Vim9script).
This commit is contained in:
Sean Dewar 2021-10-09 02:17:45 +01:00 committed by zeertzjq
parent 6415051796
commit 5feb8cdbb4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/ex_eval.c
View File

@ -1934,8 +1934,9 @@ int cleanup_conditionals(cstack_T *cstack, int searched_cond, int inclusive)
*/
if (!(cstack->cs_flags[idx] & CSF_FINALLY)) {
if ((cstack->cs_flags[idx] & CSF_ACTIVE)
&& (cstack->cs_flags[idx] & CSF_CAUGHT)) {
&& (cstack->cs_flags[idx] & CSF_CAUGHT) && !(cstack->cs_flags[idx] & CSF_FINISHED)) {
finish_exception((except_T *)cstack->cs_exception[idx]);
cstack->cs_flags[idx] |= CSF_FINISHED;
}
// Stop at this try conditional - except the try block never
// got active (because of an inactive surrounding conditional

3
src/nvim/ex_eval.h
View File

@ -16,7 +16,8 @@
#define CSF_FINALLY 0x0200 // ":finally" has been passed
#define CSF_THROWN 0x0800 // exception thrown to this try conditional
#define CSF_CAUGHT 0x1000 // exception caught by this try conditional
#define CSF_SILENT 0x2000 // "emsg_silent" reset by ":try"
#define CSF_FINISHED 0x2000 // CSF_CAUGHT was handled by finish_exception()
#define CSF_SILENT 0x4000 // "emsg_silent" reset by ":try"
// Note that CSF_ELSE is only used when CSF_TRY and CSF_WHILE are unset
// (an ":if"), and CSF_SILENT is only used when CSF_TRY is set.