From 34dd258c638bfc9e8ffac6621f3918faff3d797f Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby-lang.org>
Date: Sat, 27 May 2017 18:42:08 +0900
Subject: Unwind callinfo (mrb->c->ci) when a fiber termitates with error.

Fix #3668
---
 src/vm.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/vm.c b/src/vm.c
index 3d1433704..5ec345bb0 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -850,6 +850,7 @@ mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stac
   mrb_irep *irep = proc->body.irep;
   mrb_value result;
   struct mrb_context *c = mrb->c;
+  int cioff = c->ci - c->cibase;
 
   if (!c->stack) {
     stack_init(mrb);
@@ -859,6 +860,9 @@ mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stac
   stack_extend(mrb, 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;
+  }
   mrb->c = c;
   return result;
 }
-- 
cgit v1.2.3