diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-09 17:32:45 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-09 17:32:45 +0000 |
commit | b664caeb785d66bb882fb014f0274eb5c7f23413 (patch) | |
tree | bff6942c2bd7b47c73f56505637c5987edb7c318 /cont.c | |
parent | e2ab44ac4014698da14dfd68cc0559192534db9d (diff) |
* cont.c (fiber_switch): raise FiberError when returning to dead
fiber. [ruby-dev:40833]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cont.c')
-rw-r--r-- | cont.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1239,9 +1239,15 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume) } else if (fib->status == TERMINATED) { value = rb_exc_new2(rb_eFiberError, "dead fiber called"); - if (th->fiber != fibval) rb_exc_raise(value); - fibval = fib->prev; - if (NIL_P(fibval)) fibval = th->root_fiber; + if (th->fiber != fibval) { + GetFiberPtr(th->fiber, fib); + if (fib->status != TERMINATED) rb_exc_raise(value); + fibval = th->root_fiber; + } + else { + fibval = fib->prev; + if (NIL_P(fibval)) fibval = th->root_fiber; + } GetFiberPtr(fibval, fib); cont = &fib->cont; cont->argc = -1; |