kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases 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 USRMARSHAL without
  marshal_load method.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-04-16 14:28:29 +00:00
parent 0ea135d177
commit 982a9d8e91
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
marshal.c
View file

@ -1837,7 +1837,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
case TYPE_USRMARSHAL: case TYPE_USRMARSHAL:
{ {
VALUE klass = path2class(r_unique(arg)); VALUE name = r_unique(arg);
VALUE klass = path2class(name);
VALUE oldclass = 0; VALUE oldclass = 0;
VALUE data; VALUE data;
@ -1847,8 +1848,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
append_extmod(v, extmod); append_extmod(v, extmod);
} }
if (!rb_obj_respond_to(v, s_mload, TRUE)) { if (!rb_obj_respond_to(v, s_mload, TRUE)) {
rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'", rb_raise(rb_eTypeError, "instance of %"PRIsVALUE" needs to have method `marshal_load'",
rb_class2name(klass)); name);
} }
v = r_entry(v, arg); v = r_entry(v, arg);
data = r_object(arg); data = r_object(arg);

11
test/ruby/test_marshal.rb
View file

@ -684,4 +684,15 @@ class TestMarshal < Test::Unit::TestCase
Marshal.load(d) Marshal.load(d)
} }
end 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 end