Callinfo may be changed in `ecall()`; fix #3589

a55b237d · Yukihiro "Matz" Matsumoto · ab25eaea · a55b237d
Commit a55b237d authored Apr 10, 2017 by Yukihiro "Matz" Matsumoto
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

src/vm.c src/vm.c +2 -0

No files found.
--- a/src/vm.c
+++ b/src/vm.c
@@ -1161,6 +1161,7 @@ RETRY_TRY_BLOCK:

      for (n=0; n<a && (ci == mrb->c->cibase || eidx > ci[-1].eidx); n++) {
        ecall(mrb, --eidx);
+        ci = mrb->c->ci;
        ARENA_RESTORE(mrb, ai);
      }
      NEXT;
@@ -1706,6 +1707,7 @@ RETRY_TRY_BLOCK:
          if (ci[0].ridx == ci[-1].ridx) {
            while (eidx > ci[-1].eidx) {
              ecall(mrb, --eidx);
+              ci = mrb->c->ci;
            }
          }
        }