diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-14 17:37:35 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-14 17:37:35 +0000 |
commit | 030d9e240c8cc42d170d0290bb3a478072b9f6b5 (patch) | |
tree | 3c7e0a3937b2e778057ae7c0e7be99089112e86f | |
parent | 8bd9cec4f65e4806912b74ab13e46dd1c46d72e3 (diff) | |
download | ruby-030d9e240c8cc42d170d0290bb3a478072b9f6b5.tar.gz ruby-030d9e240c8cc42d170d0290bb3a478072b9f6b5.tar.xz ruby-030d9e240c8cc42d170d0290bb3a478072b9f6b5.zip |
* transcode.c (str_encode): returns duplicated string if nothing
changed. [ruby-core:18578]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_transcode.rb | 6 | ||||
-rw-r--r-- | transcode.c | 7 |
3 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Sep 15 02:37:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * transcode.c (str_encode): returns duplicated string if nothing + changed. [ruby-core:18578] + Sun Sep 14 22:09:01 2008 Takeyuki Fujioka <xibbar@ruby-lang.org> * lib/cgi/core.rb (CGI::parse): performance improvement diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb index 5abeed88e..8770328bc 100644 --- a/test/ruby/test_transcode.rb +++ b/test/ruby/test_transcode.rb @@ -582,4 +582,10 @@ class TestTranscode < Test::Unit::TestCase assert_raise(Encoding::ConversionUndefined) { "\u203E".encode("CP51932") } end + def test_nothing_changed + a = "James".force_encoding("US-ASCII") + b = a.encode("Shift_JIS") + assert_equal(Encoding::US_ASCII, a.encoding) + assert_equal(Encoding::Shift_JIS, b.encoding) + end end diff --git a/transcode.c b/transcode.c index 4d1107ddc..1c1126fcc 100644 --- a/transcode.c +++ b/transcode.c @@ -2570,7 +2570,12 @@ str_encode(int argc, VALUE *argv, VALUE str) int encidx = str_transcode(argc, argv, &newstr); if (encidx < 0) return rb_str_dup(str); - RBASIC(newstr)->klass = rb_obj_class(str); + if (newstr == str) { + newstr = rb_str_dup(str); + } + else { + RBASIC(newstr)->klass = rb_obj_class(str); + } return str_encode_associate(newstr, encidx); } |