marshal.c: use ivars of marshal_dump data

* marshal.c (w_object): dump no ivars to the original by marshal_dump.
  [ruby-core:54334] [Bug #8276]
* marshal.c (r_object0): copy all ivars of marshal_dump data to the
  result object instead.  [ruby-core:51163] [Bug #7627]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,11 @@
+Sat Apr 20 14:22:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): dump no ivars to the original by marshal_dump.
+	  [ruby-core:54334] [Bug #8276]
+
+	* marshal.c (r_object0): copy all ivars of marshal_dump data to the
+	  result object instead.  [ruby-core:51163] [Bug #7627]
+
 Sat Apr 20 02:33:27 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* string.c (str_scrub): add ruby method String#scrub which verify and

marshal.c

@@ -598,8 +598,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
     st_table *ivtbl = 0;
     st_data_t num;
     int hasiv = 0;
-#define has_ivars_noenc(obj, ivtbl) (((ivtbl) = rb_generic_ivar_table(obj)) != 0)
-#define has_ivars(obj, ivtbl) (has_ivars_noenc(obj, ivtbl) || \
+#define has_ivars(obj, ivtbl) ((((ivtbl) = rb_generic_ivar_table(obj)) != 0) || \
 			       (!SPECIAL_CONST_P(obj) && !ENCODING_IS_ASCII8BIT(obj)))
 
     if (limit == 0) {
@@ -657,11 +656,8 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
 
 	    v = rb_funcall2(obj, s_mdump, 0, 0);
 	    check_dump_arg(arg, s_mdump);
-	    hasiv = has_ivars_noenc(v, ivtbl);
-	    if (hasiv) w_byte(TYPE_IVAR, arg);
 	    w_class(TYPE_USRMARSHAL, obj, arg, FALSE);
 	    w_object(v, arg, limit);
-	    if (hasiv) w_ivar(v, ivtbl, &c_arg);
 	    return;
 	}
 	if (rb_obj_respond_to(obj, s_dump, TRUE)) {
@@ -1772,6 +1768,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
 	    VALUE klass = path2class(r_unique(arg));
 	    VALUE oldclass = 0;
 	    VALUE data;
+	    st_table *ivtbl;
 
 	    v = obj_alloc_by_klass(klass, arg, &oldclass);
             if (!NIL_P(extmod)) {
@@ -1787,6 +1784,11 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
 	    rb_funcall2(v, s_mload, 1, &data);
 	    check_load_arg(arg, s_mload);
             v = r_leave(v, arg);
+	    ivtbl = rb_generic_ivar_table(data);
+	    if (ivtbl && ivtbl->num_entries) {
+		rb_check_frozen(v);
+		rb_copy_generic_ivar(v, data);
+	    }
 	    if (!NIL_P(extmod)) {
 		if (oldclass) append_extmod(v, extmod);
 		rb_ary_clear(extmod);

test/ruby/test_marshal.rb

@@ -553,10 +553,18 @@ class TestMarshal < Test::Unit::TestCase
     bug8276 = '[ruby-core:54334] [Bug #8276]'
     t = Bug8276.new(bug8276)
     s = Marshal.dump(t)
-    assert_nothing_raised(RuntimeError) {s = Marshal.load(s)}
+    assert_nothing_raised(RuntimeError, bug8276) {s = Marshal.load(s)}
     assert_equal(t.data, s.data, bug8276)
   end
 
+  def test_marshal_dump_ivar
+    s = "data with ivar"
+    s.instance_variable_set(:@t, 42)
+    t = Bug8276.new(s)
+    s = Marshal.dump(t)
+    assert_raise(RuntimeError) {Marshal.load(s)}
+  end
+
   def test_class_ivar
     assert_raise(TypeError) {Marshal.load("\x04\x08Ic\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")}
     assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")}