admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unwind callinfo (mrb->c->ci) when a fiber termitates with error.

Browse Source 
Fix #3668
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-05-27 18:42:08 +09:00
parent 57ffa1c150
commit 34dd258c63
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+4
View File
@@ -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;
}