From c4641d6a00c4ea3689867d74ae347c6505371af0 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 31 Jul 2009 20:36:04 +0000 Subject: Can't use singlebyte optimization when the replacement is multibyte. [ruby-core:24612] * string.c (tr_trans): can't use singlebyte optimization when the replacement is multibyte. [ruby-core:24612] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5ce6a305d8..9eac1dd169 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 1 05:18:36 2009 NARUSE, Yui + + * string.c (tr_trans): can't use singlebyte optimization when + the replacement is multibyte. [ruby-core:24612] + Fri Jul 31 18:01:34 2009 NAKAMURA Usaku * lib/securerandom.rb (SecureRandom.random_bytes): return string should diff --git a/string.c b/string.c index 34f35b8b29..6e6db0053a 100644 --- a/string.c +++ b/string.c @@ -4871,7 +4871,8 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) if (r == errc) r = trrepl.now; if (c < 256) { trans[c] = r; - if (r > 255) singlebyte = 0; + if (r > 255 || (r > 127 && rb_enc_mbmaxlen(enc) != 1)) + singlebyte = 0; } else { if (!hash) hash = rb_hash_new(); -- cgit v1.2.3