ruby-changes:14220
From: nobu <ko1@a...>
Date: Mon, 7 Dec 2009 14:11:26 +0900 (JST)
Subject: [ruby-changes:14220] Ruby:r26042 (trunk): * marshal.c (w_object): reverted r26007.
nobu 2009-12-07 14:11:10 +0900 (Mon, 07 Dec 2009) New Revision: 26042 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26042 Log: * marshal.c (w_object): reverted r26007. [ruby-dev:39845] * test/test_delegate.rb (test_marshal): moved from test_marshal.rb. Modified files: trunk/ChangeLog trunk/marshal.c trunk/test/ruby/test_marshal.rb trunk/test/test_delegate.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 26041) +++ ChangeLog (revision 26042) @@ -1,3 +1,9 @@ +Mon Dec 7 14:11:08 2009 Nobuyoshi Nakada <nobu@r...> + + * marshal.c (w_object): reverted r26007. [ruby-dev:39845] + + * test/test_delegate.rb (test_marshal): moved from test_marshal.rb. + Mon Dec 7 13:05:59 2009 Yuki Sonoda (Yugui) <yugui@y...> * string.c (rb_str_justify): CVE-2009-4124. Index: marshal.c =================================================================== --- marshal.c (revision 26041) +++ marshal.c (revision 26042) @@ -643,23 +643,14 @@ if (rb_respond_to(obj, s_mdump)) { volatile VALUE v; - int hasiv2 = 0; st_add_direct(arg->data, obj, arg->data->num_entries); v = rb_funcall(obj, s_mdump, 0, 0); check_dump_arg(arg, s_mdump); - if (!hasiv && (hasiv2 = rb_ivar_count(obj) > 0)) { - w_byte(TYPE_IVAR, arg); - } w_class(TYPE_USRMARSHAL, obj, arg, FALSE); w_object(v, arg, limit); - if (hasiv) { - w_ivar(obj, ivtbl, &c_arg); - } - else if (hasiv2) { - w_objivar(obj, &c_arg); - } + if (hasiv) w_ivar(obj, ivtbl, &c_arg); return; } if (rb_respond_to(obj, s_dump)) { Index: test/ruby/test_marshal.rb =================================================================== --- test/ruby/test_marshal.rb (revision 26041) +++ test/ruby/test_marshal.rb (revision 26042) @@ -323,11 +323,10 @@ end end def test_marshal_dump - bug1744 = '[ruby-core:24211]' c = C5.new("bar") s = Marshal.dump(c) d = Marshal.load(s) - assert_equal("foo", d.instance_variable_get(:@foo), bug1744) - assert_equal("bar", d.instance_variable_get(:@x), bug1744) + assert_equal("foo", d.instance_variable_get(:@foo)) + assert_equal(false, d.instance_variable_defined?(:@x)) end end Index: test/test_delegate.rb =================================================================== --- test/test_delegate.rb (revision 26041) +++ test/test_delegate.rb (revision 26042) @@ -51,4 +51,20 @@ assert_equal(:m, SimpleDelegator.new(Foo.new).m) assert_equal(:m, Bar.new(Foo.new).m) end + + class IV < DelegateClass(Integer) + attr_accessor :var + + def initialize + @var = 1 + end + end + + def test_marshal + bug1744 = '[ruby-core:24211]' + c = IV.new + assert_equal(1, c.var) + d = Marshal.load(Marshal.dump(c)) + assert_equal(1, d.var, bug1744) + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/