diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-16 14:28:29 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-16 14:28:29 +0000 |
commit | 982a9d8e91a0de6abd2af3d888aba1aa2880103c (patch) | |
tree | cd08c6f45606c10a1f16ee081ffd030fa164cb30 | |
parent | 0ea135d177cfda4ea565d8f3934379ccf405826d (diff) |
marshal.c: class name encoding
* marshal.c (r_object0): preserve the encoding of the class name
in an error message, in the case of USRMARSHAL without
marshal_load method.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | marshal.c | 7 | ||||
-rw-r--r-- | test/ruby/test_marshal.rb | 11 |
2 files changed, 15 insertions, 3 deletions
@@ -1837,7 +1837,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) case TYPE_USRMARSHAL: { - VALUE klass = path2class(r_unique(arg)); + VALUE name = r_unique(arg); + VALUE klass = path2class(name); VALUE oldclass = 0; VALUE data; @@ -1847,8 +1848,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) append_extmod(v, extmod); } if (!rb_obj_respond_to(v, s_mload, TRUE)) { - rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'", - rb_class2name(klass)); + rb_raise(rb_eTypeError, "instance of %"PRIsVALUE" needs to have method `marshal_load'", + name); } v = r_entry(v, arg); data = r_object(arg); diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 1b74b47dd1..3548850a42 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -684,4 +684,15 @@ class TestMarshal < Test::Unit::TestCase Marshal.load(d) } end + + def test_unloadable_usrmarshal + c = eval("class UsrMarshal\u{23F0 23F3}<Time;self;end") + c.class_eval { + alias marshal_dump _dump + } + d = Marshal.dump(c.new) + assert_raise_with_message(TypeError, /UsrMarshal\u{23F0 23F3}/) { + Marshal.load(d) + } + end end |