diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-16 03:07:41 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-16 03:07:41 +0000 |
commit | ee56b1655250ce36d2ca40d174ea244437265602 (patch) | |
tree | 7b4a5b49e4ccf53034251634d58f5d84ee9e5fa3 /cont.c | |
parent | 802578a3b1701f351da7aeed7d6d0045a9122afb (diff) |
merges r27713 and r27715 from trunk into ruby_1_9_2.
--
* cont.c (fiber_switch): raise FiberError when returning to dead
fiber. [ruby-dev:40833]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27809 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; |