kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

marshal.c: undumpable hidden objects

Browse source 
* marshal.c (w_object): internal objects are not dumpable.
  [ruby-core:61677] [Bug #9674]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-03-26 02:20:52 +00:00
parent 1dd527012b
commit 3935f2ae6e
4 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Wed Mar 26 11:20:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
Wed Mar 26 11:20:50 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (w_object): internal objects are not dumpable.
[ruby-core:61677] [Bug #9674]
* ext/thread/thread.c (undumpable): ConditionVariable and Queue
are not dumpable. [ruby-core:61677] [Bug #9674]

5
marshal.c
View file

@ -677,6 +677,11 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
else {
VALUE v;
if (!RBASIC_CLASS(obj)) {
rb_raise(rb_eTypeError, "can't dump internal %s",
rb_builtin_type_name(BUILTIN_TYPE(obj)));
}
arg->infection |= (int)FL_TEST(obj, MARSHAL_INFECTION);
if (rb_obj_respond_to(obj, s_mdump, TRUE)) {

7
test/thread/test_cv.rb
View file

@ -197,11 +197,18 @@ INPUT
end
end
(DumpableCV = ConditionVariable.dup).class_eval {remove_method :marshal_dump}
def test_dump
bug9674 = '[ruby-core:61677] [Bug #9674]'
condvar = ConditionVariable.new
assert_raise_with_message(TypeError, /#{ConditionVariable}/, bug9674) do
Marshal.dump(condvar)
end
condvar = DumpableCV.new
assert_raise_with_message(TypeError, /internal Array/, bug9674) do
Marshal.dump(condvar)
end
end
end

7
test/thread/test_queue.rb
View file

@ -216,6 +216,8 @@ class TestQueue < Test::Unit::TestCase
end
end
(DumpableQueue = Queue.dup).class_eval {remove_method :marshal_dump}
def test_dump
bug9674 = '[ruby-core:61677] [Bug #9674]'
q = Queue.new
@ -227,5 +229,10 @@ class TestQueue < Test::Unit::TestCase
assert_raise_with_message(TypeError, /#{SizedQueue}/, bug9674) do
Marshal.dump(sq)
end
q = DumpableQueue.new
assert_raise_with_message(TypeError, /internal Array/, bug9674) do
Marshal.dump(q)
end
end
end