From b664caeb785d66bb882fb014f0274eb5c7f23413 Mon Sep 17 00:00:00 2001 From: mame Date: Sun, 9 May 2010 17:32:45 +0000 Subject: * 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 --- cont.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'cont.c') diff --git a/cont.c b/cont.c index 8bb9821c7c..11428564be 100644 --- a/cont.c +++ b/cont.c @@ -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; -- cgit v1.2.3