1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marshal.c: class name encoding

Browse Source 
* marshal.c (r_object0): preserve the encoding of the class name
  in an error message, in the case of no _load_data method.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-04-16 14:25:19 +00:00
parent bdf16df33a
commit 53e4fb8c80
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
marshal.c
View File

@ -1878,7 +1878,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
case TYPE_DATA: case TYPE_DATA:
{ {
VALUE klass = path2class(r_unique(arg)); VALUE name = r_unique(arg);
VALUE klass = path2class(name);
VALUE oldclass = 0; VALUE oldclass = 0;
VALUE r; VALUE r;
@ -1889,8 +1890,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
v = r_entry(v, arg); v = r_entry(v, arg);
if (!rb_obj_respond_to(v, s_load_data, TRUE)) { if (!rb_obj_respond_to(v, s_load_data, TRUE)) {
rb_raise(rb_eTypeError, rb_raise(rb_eTypeError,
"class %s needs to have instance method `_load_data'", "class %"PRIsVALUE" needs to have instance method `_load_data'",
rb_class2name(klass)); name);
} }
r = r_object0(arg, 0, extmod); r = r_object0(arg, 0, extmod);
rb_funcall2(v, s_load_data, 1, &r); rb_funcall2(v, s_load_data, 1, &r);

12
test/ruby/test_marshal.rb
View File

@ -661,4 +661,16 @@ class TestMarshal < Test::Unit::TestCase
Marshal.dump(c.new) Marshal.dump(c.new)
} }
end end
def test_unloadable_data
c = eval("class Unloadable\u{23F0 23F3}<Time;;self;end")
c.class_eval {
alias _dump_data _dump
undef _dump
}
d = Marshal.dump(c.new)
assert_raise_with_message(TypeError, /Unloadable\u{23F0 23F3}/) {
Marshal.load(d)
}
end
end end