diff options
-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 |