* marshal.c (id2encidx): register encoding name.

  (r_object0): register object before encoding name.
  [ruby-core:24882]


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

1 files changed, 43 insertions, 0 deletions

diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb
index b010dcc46f..7f9a8f48e1 100644
--- a/test/ruby/test_marshal.rb
+++ b/test/ruby/test_marshal.rb
@@ -200,9 +200,52 @@ class TestMarshal < Test::Unit::TestCase
   end
 
   ClassUTF8 = eval("class R\u{e9}sum\u{e9}; self; end")
+
+  iso_8859_1 = Encoding::ISO_8859_1
+
+  structISO8859_1 = Struct.new("r\xe9sum\xe9".force_encoding(iso_8859_1).intern)
+  const_set("R\xe9sum\xe9".force_encoding(iso_8859_1), structISO8859_1)
+  structISO8859_1.name
+  StructISO8859_1 = structISO8859_1
+  classISO8859_1 = Class.new do
+    attr_accessor "r\xe9sum\xe9".force_encoding(iso_8859_1)
+    eval("def initialize(x) @r\xe9sum\xe9 = x; end".force_encoding(iso_8859_1))
+  end
+  const_set("R\xe9sum\xe92".force_encoding(iso_8859_1), classISO8859_1)
+  classISO8859_1.name
+  ClassISO8859_1 = classISO8859_1
+
   def test_class_nonascii
     a = ClassUTF8.new
     assert_instance_of(ClassUTF8, Marshal.load(Marshal.dump(a)), '[ruby-core:24790]')
+
+    bug1932 = '[ruby-core:24882]'
+
+    a = StructISO8859_1.new(10)
+    assert_nothing_raised(bug1932) do
+      assert_equal(a, Marshal.load(Marshal.dump(a)), bug1932)
+    end
+    a.__send__("#{StructISO8859_1.members[0]}=", a)
+    assert_nothing_raised(bug1932) do
+      assert_equal(a, Marshal.load(Marshal.dump(a)), bug1932)
+    end
+
+    a = ClassISO8859_1.new(10)
+    assert_nothing_raised(bug1932) do
+      b = Marshal.load(Marshal.dump(a))
+      assert_equal(ClassISO8859_1, b.class, bug1932)
+      assert_equal(a.instance_variables, b.instance_variables, bug1932)
+      a.instance_variables.each do |i|
+        assert_equal(a.instance_variable_get(i), b.instance_variable_get(i), bug1932)
+      end
+    end
+    a.__send__(a.methods(true).grep(/=\z/)[0], a)
+    assert_nothing_raised(bug1932) do
+      b = Marshal.load(Marshal.dump(a))
+      assert_equal(ClassISO8859_1, b.class, bug1932)
+      assert_equal(a.instance_variables, b.instance_variables, bug1932)
+      assert_equal(b, b.instance_variable_get(a.instance_variables[0]), bug1932)
+    end
   end
 
   def test_regexp