neovim

commit a25c35d6e409398a8d8304210784e020c262aec5
parent 93c72d866b3a41c429dd9d278cda7059ebd4afba
Author: Sean Dewar <seandewar@users.noreply.github.com>
Date:   Sat,  9 Oct 2021 02:13:49 +0100

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

Problem:    Crash with error in :catch and also in :finally.
Solution:   Only discard an exception if there is one. (closes vim/vim#8954)
https://github.com/vim/vim/commit/a684a684096ecef3fbaee39c573b47423235d6b1

Diffstat:
M
src/nvim/ex_eval.c
 | 
2
+-
M
src/nvim/testdir/test_trycatch.vim
 | 
12
++++++++++++

2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
@@ -1913,7 +1913,7 @@ int cleanup_conditionals(cstack_T *cstack, int searched_cond, int inclusive)
 
         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
               // caught exceptions is not involved.
diff --git a/src/nvim/testdir/test_trycatch.vim b/src/nvim/testdir/test_trycatch.vim
@@ -2045,6 +2045,18 @@ func Test_user_command_function_call_with_endtry()
   call delete('XtestThrow')
 endfunc
 
+func ThisWillFail()
+  try
+    if x | endif
+  catch
+    for l in []
+  finally 
+endfunc
+
+func Test_error_in_catch_and_finally()
+  call assert_fails('call ThisWillFail()', ['E121:', 'E600:'])
+endfunc
+
 
 " Modeline								    {{{1
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker