patch 8.2.3076: Vim9: using try in catch block causes a hang

Problem:    Vim9: using try in catch block causes a hang.
Solution:   Save and restore the ec_in_catch flag. (closes #8478)

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 3ff34a2475d53738eefb4f62e2ace1d2f07dd26d..40cdfa39c17e493a0b27cd4d7ad5432fbf99d390 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -605,6 +605,32 @@ def Test_try_catch_throw()
   unlet g:caught
 enddef
 
+def Test_try_in_catch()
+  var lines =<< trim END
+      vim9script
+      var seq = []
+      def DoIt()
+        try
+          seq->add('throw 1')
+          eval [][0]
+          seq->add('notreached')
+        catch
+          seq->add('catch')
+          try
+            seq->add('throw 2')
+            eval [][0]
+            seq->add('notreached')
+          catch /nothing/
+            seq->add('notreached')
+          endtry
+          seq->add('done')
+        endtry
+      enddef
+      DoIt()
+      assert_equal(['throw 1', 'catch', 'throw 2', 'done'], seq)
+  END
+enddef
+
 " :while at the very start of a function that :continue jumps to
 def TryContinueFunc()
  while g:Count < 2

diff --git a/src/version.c b/src/version.c
index 466cde1b13186edf2573eec2e2dacc510ee392e3..70e0ff2f9d94138863fd553355abf0981634f929 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3076,
 /**/
     3075,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index 3233e3ca3a66ae9077528513cec6a20ae435f500..0de11bab0b01201480c863253132e654e37d9c03 100644 (file)
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -26,6 +26,7 @@
 typedef struct {
     int            tcd_frame_idx;      // ec_frame_idx at ISN_TRY
     int            tcd_stack_len;      // size of ectx.ec_stack at ISN_TRY
+    int            tcd_save_in_catch;  // saved ec_in_catch
     int            tcd_catch_idx;      // instruction of the first :catch or :finally
     int            tcd_finally_idx;    // instruction of the :finally block or zero
     int            tcd_endtry_idx;     // instruction of the :endtry
@@ -3166,6 +3167,8 @@ exec_instructions(ectx_T *ectx)
                    CLEAR_POINTER(trycmd);
                    trycmd->tcd_frame_idx = ectx->ec_frame_idx;
                    trycmd->tcd_stack_len = ectx->ec_stack.ga_len;
+                   trycmd->tcd_save_in_catch = ectx->ec_in_catch;
+                   ectx->ec_in_catch = FALSE;
                    trycmd->tcd_catch_idx =
                                          iptr->isn_arg.try.try_ref->try_catch;
                    trycmd->tcd_finally_idx =
@@ -3263,9 +3266,9 @@ exec_instructions(ectx_T *ectx)
 
                        --trystack->ga_len;
                        --trylevel;
-                       ectx->ec_in_catch = FALSE;
                        trycmd = ((trycmd_T *)trystack->ga_data)
                                                            + trystack->ga_len;
+                       ectx->ec_in_catch = trycmd->tcd_save_in_catch;
                        if (trycmd->tcd_caught && current_exception != NULL)
                        {
                            // discard the exception