diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-03 03:25:21 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-03 03:25:21 +0000 |
commit | edb7bc0b4d84fda235aaef2a65728418298d5c1d (patch) | |
tree | b73080d7ea01f8d6b9947d980f586a738404e47b | |
parent | e1b932d0c26e93aa0117fc91dc052312a345de27 (diff) | |
download | ruby-edb7bc0b4d84fda235aaef2a65728418298d5c1d.tar.gz |
transcode.c: empty encoding name
* transcode.c (rb_econv_set_replacement): target encoding name can
be empty now. [ruby-core:69841] [Bug #11324]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_transcode.rb | 9 | ||||
-rw-r--r-- | transcode.c | 2 |
3 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Jul 3 12:25:19 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * transcode.c (rb_econv_set_replacement): target encoding name can + be empty now. [ruby-core:69841] [Bug #11324] + Fri Jul 3 07:21:06 2015 Eric Wong <e@80x24.org> * benchmark/bm_io_nonblock_noex.rb: new benchmark diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb index 8ace00c172..4bade11a51 100644 --- a/test/ruby/test_transcode.rb +++ b/test/ruby/test_transcode.rb @@ -2109,4 +2109,13 @@ class TestTranscode < Test::Unit::TestCase assert_equal([expected]*num, result, bug11277) end; end + + def test_universal_newline + bug11324 = '[ruby-core:69841] [Bug #11324]' + usascii = Encoding::US_ASCII + s = "A\nB\r\nC".force_encoding(usascii) + assert_equal("A\nB\nC", s.encode(usascii, universal_newline: true), bug11324) + assert_equal("A\nB\nC", s.encode(usascii, universal_newline: true, undef: :replace), bug11324) + assert_equal("A\nB\nC", s.encode(usascii, universal_newline: true, undef: :replace, replace: ''), bug11324) + end end diff --git a/transcode.c b/transcode.c index b9d0adc553..5e20fd73a4 100644 --- a/transcode.c +++ b/transcode.c @@ -2199,7 +2199,7 @@ rb_econv_set_replacement(rb_econv_t *ec, encname2 = rb_econv_encoding_to_insert_output(ec); - if (encoding_equal(encname, encname2)) { + if (!*encname2 || encoding_equal(encname, encname2)) { str2 = xmalloc(len); MEMCPY(str2, str, unsigned char, len); /* xxx: str may be invalid */ len2 = len; |