diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | marshal.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Fri Jul 10 14:41:34 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * marshal.c (r_object0): set encoding only if the encoding + is not US-ASCII. Fri Jul 10 14:44:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * random.c (struct MT): ruby already assumes int has 32bit a @@ -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")); |