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

mruby · Apr 10, 2017 · a55b237 · a55b237
1 parent ab25eae
commit a55b237
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/vm.c b/src/vm.c
@@ -1161,6 +1161,7 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
 
       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 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
           if (ci[0].ridx == ci[-1].ridx) {
             while (eidx > ci[-1].eidx) {
               ecall(mrb, --eidx);
+              ci = mrb->c->ci;
             }
           }
         }