diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cont.c | 12 | ||||
-rw-r--r-- | test/ruby/test_fiber.rb | 11 |
3 files changed, 25 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon May 10 02:29:51 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * cont.c (fiber_switch): raise FiberError when returning to dead + fiber. [ruby-dev:40833] + Mon May 10 02:07:20 2010 Yusuke Endoh <mame@tsg.ne.jp> * lib/thread.rb (ConditionVariable#wait): ensure to remove the current @@ -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; diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb index e6afe55b96..4916ac9fd2 100644 --- a/test/ruby/test_fiber.rb +++ b/test/ruby/test_fiber.rb @@ -1,6 +1,7 @@ require 'test/unit' require 'fiber' require 'continuation' +require_relative './envutil' class TestFiber < Test::Unit::TestCase def test_normal @@ -178,5 +179,15 @@ class TestFiber < Test::Unit::TestCase f = Fiber.new {f.resume} assert_raise(FiberError, '[ruby-core:23651]') {f.transfer} end + + def test_fiber_transfer_segv + assert_normal_exit %q{ + require 'fiber' + f2 = nil + f1 = Fiber.new{ f2.resume } + f2 = Fiber.new{ f1.resume } + f1.transfer + } + end end |