diff options
| -rw-r--r-- | marshal.c | 7 | ||||
| -rw-r--r-- | test/ruby/test_marshal.rb | 11 |
2 files changed, 15 insertions, 3 deletions
@@ -1815,12 +1815,13 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) case TYPE_USERDEF: { - VALUE klass = path2class(r_unique(arg)); + VALUE name = r_unique(arg); + VALUE klass = path2class(name); VALUE data; if (!rb_obj_respond_to(klass, s_load, TRUE)) { - rb_raise(rb_eTypeError, "class %s needs to have method `_load'", - rb_class2name(klass)); + rb_raise(rb_eTypeError, "class %"PRIsVALUE" needs to have method `_load'", + name); } data = r_string(arg); if (ivp) { diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 2a72703adc..1b74b47dd1 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -673,4 +673,15 @@ class TestMarshal < Test::Unit::TestCase Marshal.load(d) } end + + def test_unloadable_userdef + c = eval("class Userdef\u{23F0 23F3}<Time;self;end") + class << c + undef _load + end + d = Marshal.dump(c.new) + assert_raise_with_message(TypeError, /Userdef\u{23F0 23F3}/) { + Marshal.load(d) + } + end end |