From 982a9d8e91a0de6abd2af3d888aba1aa2880103c Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 16 Apr 2015 14:28:29 +0000 Subject: 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 --- marshal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'marshal.c') diff --git a/marshal.c b/marshal.c index 3d42c7bb2f..8eb7b07329 100644 --- a/marshal.c +++ b/marshal.c @@ -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); -- cgit v1.2.3