break in blocks cannot cross C function boundaries; fix #2298

a6f26514 · Yukihiro "Matz" Matsumoto · abbb8c5c · a6f26514
Commit a6f26514 authored May 21, 2014 by Yukihiro "Matz" Matsumoto
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

src/vm.c src/vm.c +9 -1

No files found.
--- a/src/vm.c
+++ b/src/vm.c
@@ -1481,7 +1481,15 @@ RETRY_TRY_BLOCK:
            mrb->c = c->prev;
            c->prev = NULL;
          }
-          ci = mrb->c->ci = mrb->c->cibase + proc->env->cioff + 1;
+          ci = mrb->c->ci;
+          mrb->c->ci = mrb->c->cibase + proc->env->cioff + 1;
+          while (ci > mrb->c->ci) {
+            if (ci[-1].acc == CI_ACC_SKIP) {
+              mrb->c->ci = ci;
+              break;
+            }
+            ci--;
+          }
          break;
        default:
          /* cannot happen */