Mercurial > vim
changeset 25889:c83ebae45881 v8.2.3478
patch 8.2.3478: still crash with error in :catch and also in :finally
Commit: https://github.com/vim/vim/commit/f67d3fb7363ebc9454f9bb582de3978609a4fd6b
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Oct 5 11:22:27 2021 +0100
patch 8.2.3478: still crash with error in :catch and also in :finally
Problem: Still crash with error in :catch and also in :finally.
Solution: Only call finish_exception() once. (closes https://github.com/vim/vim/issues/8954)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 05 Oct 2021 12:30:04 +0200 |
| parents | 87ef006b26d4 |
| children | 7fb29ee9c3be |
| files | src/ex_eval.c src/structs.h src/version.c |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -2401,8 +2401,12 @@ cleanup_conditionals( 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 // or when the ":try" appeared after an error or interrupt or
--- a/src/structs.h +++ b/src/structs.h @@ -943,11 +943,12 @@ typedef struct { # define CSF_CATCH 0x0400 // ":catch" has been seen # 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. -// -#define CSF_FUNC_DEF 0x4000 // a function was defined in this block + +# define CSF_FUNC_DEF 0x8000 // a function was defined in this block /* * What's pending for being reactivated at the ":endtry" of this try