From 143d1d840d18636379c141e425fe79cfe2f0e8bf Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 10 Jul 2009 05:51:17 +0000 Subject: * marshal.c (r_object0): set encoding only if the encoding is not US-ASCII. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ marshal.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 20b5e1570a..1dc1060887 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jul 10 14:41:34 2009 NARUSE, Yui + + * marshal.c (r_object0): set encoding only if the encoding + is not US-ASCII. Fri Jul 10 14:44:03 2009 Nobuyoshi Nakada * random.c (struct MT): ruby already assumes int has 32bit a diff --git a/marshal.c b/marshal.c index 3659e15fbf..e7c0c4b642 100644 --- a/marshal.c +++ b/marshal.c @@ -1398,7 +1398,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) r_ivar(v, arg); *ivp = Qfalse; } - rb_enc_copy(str, v); + if (rb_enc_get_index(v) != rb_usascii_encindex()) + rb_enc_copy(str, v); if (rb_enc_get_index(str) != rb_utf8_encindex()) { #define f_gsub_bang(x,y,z) rb_funcall(x, rb_intern("gsub!"), 2, y, z) f_gsub_bang(str, rb_reg_new("\\\\u", 3, 0), rb_usascii_str_new_cstr("u")); -- cgit v1.2.3