summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-fiber/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-03-18 23:47:01 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-03-18 23:47:01 +0900
commit53a282ac0e0da85994233dac1daabb6381669e51 (patch)
tree7e78a206db8c5ac7fe7e6dbfb706a1776f9e8054 /mrbgems/mruby-fiber/src
parent31b2980acb7218b0cc13cbc658208cde641a7ff8 (diff)
downloadmruby-53a282ac0e0da85994233dac1daabb6381669e51.tar.gz
mruby-53a282ac0e0da85994233dac1daabb6381669e51.zip
stricter check for double resume; close #1885
Diffstat (limited to 'mrbgems/mruby-fiber/src')
-rw-r--r--mrbgems/mruby-fiber/src/fiber.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mrbgems/mruby-fiber/src/fiber.c b/mrbgems/mruby-fiber/src/fiber.c
index f67e02e56..381ede062 100644
--- a/mrbgems/mruby-fiber/src/fiber.c
+++ b/mrbgems/mruby-fiber/src/fiber.c
@@ -164,7 +164,7 @@ fiber_resume(mrb_state *mrb, mrb_value self)
mrb_raise(mrb, E_ARGUMENT_ERROR, "can't cross C function boundary");
}
}
- if (c->status == MRB_FIBER_RUNNING) {
+ if (c->status == MRB_FIBER_RUNNING || (mrb->c->prev && mrb->c->prev != mrb->root_c)) {
mrb_raise(mrb, E_RUNTIME_ERROR, "double resume");
}
if (c->status == MRB_FIBER_TERMINATED) {