From 31a961acf16b7a9454ccb0f0ece91b79e95f7078 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Mon, 19 Nov 2018 09:50:31 +0900
Subject: The current context may be changed in `mrb_vm_exec`; ref #3668 #4104

---
 src/vm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/vm.c b/src/vm.c
index b899a2d70..2d12df4ba 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -973,15 +973,15 @@ mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stac
   stack_clear(c->stack + stack_keep, nregs - stack_keep);
   c->stack[0] = self;
   result = mrb_vm_exec(mrb, proc, irep->iseq);
-  if (c->ci - c->cibase > cioff) {
-    c->ci = c->cibase + cioff;
-  }
   if (mrb->c != c) {
     if (mrb->c->fib) {
       mrb_write_barrier(mrb, (struct RBasic*)mrb->c->fib);
     }
     mrb->c = c;
   }
+  else if (c->ci - c->cibase > cioff) {
+    c->ci = c->cibase + cioff;
+  }
   return result;
 }
 
-- 
cgit v1.2.3