From dd998dd561c75054679f69b7e9d30af4bae7cfaa Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 17 Feb 2014 08:41:57 +0000 Subject: marshal.c: do not recycle wrapper objects * marshal.c (marshal_dump, marshal_load): do not recycle wrapper objects, to prevent from segfault with continuation. [ruby-dev:47970] [Bug #9523] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_marshal.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'test') diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index d0ae231d87..1bbc999258 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -611,4 +611,23 @@ class TestMarshal < Test::Unit::TestCase end assert_empty(tainted.map {|x| [x, x.class]}, bug8945) end + + class Bug9523 + attr_reader :cc + def marshal_dump + callcc {|c| @cc = c } + nil + end + def marshal_load(v) + end + end + + def test_continuation + require "continuation" + c = Bug9523.new + assert_raise_with_message(RuntimeError, /Marshal\.dump reentered at marshal_dump/) do + Marshal.dump(c) + c.cc.call + end + end end -- cgit v1.2.3