From 53e4fb8c8027bd28f4aa8cda605b403b1a8a9aa4 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 16 Apr 2015 14:25:19 +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 no _load_data method. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50331 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 958778377d..ba5e75c9a2 100644 --- a/marshal.c +++ b/marshal.c @@ -1878,7 +1878,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) case TYPE_DATA: { - VALUE klass = path2class(r_unique(arg)); + VALUE name = r_unique(arg); + VALUE klass = path2class(name); VALUE oldclass = 0; VALUE r; @@ -1889,8 +1890,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) v = r_entry(v, arg); if (!rb_obj_respond_to(v, s_load_data, TRUE)) { rb_raise(rb_eTypeError, - "class %s needs to have instance method `_load_data'", - rb_class2name(klass)); + "class %"PRIsVALUE" needs to have instance method `_load_data'", + name); } r = r_object0(arg, 0, extmod); rb_funcall2(v, s_load_data, 1, &r); -- cgit v1.2.3