diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-10-04 18:52:19 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-10-04 18:52:19 +0100 |
commit | a684a684096ecef3fbaee39c573b47423235d6b1 (patch) | |
tree | 387ee22bdbd6a9d0483b695cb09686c7af9b1fa2 /src/ex_eval.c | |
parent | 50c56893423eb6ad2154a4151e67f7097f52efb6 (diff) | |
download | vim-git-a684a684096ecef3fbaee39c573b47423235d6b1.tar.gz |
patch 8.2.3470: crash with error in :catch and also in :finallyv8.2.3470
Problem: Crash with error in :catch and also in :finally.
Solution: Only discard an exception if there is one. (closes #8954)
Diffstat (limited to 'src/ex_eval.c')
-rw-r--r-- | src/ex_eval.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index 259cf670c..503a3ae02 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -2374,7 +2374,8 @@ cleanup_conditionals( default: if (cstack->cs_flags[idx] & CSF_FINALLY) { - if (cstack->cs_pending[idx] & CSTP_THROW) + if ((cstack->cs_pending[idx] & CSTP_THROW) + && cstack->cs_exception[idx] != NULL) { // Cancel the pending exception. This is in the // finally clause, so that the stack of the |