From edb7bc0b4d84fda235aaef2a65728418298d5c1d Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 3 Jul 2015 03:25:21 +0000 Subject: 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 --- ChangeLog | 5 +++++ test/ruby/test_transcode.rb | 9 +++++++++ transcode.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 07c011544d..9316512522 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 3 12:25:19 2015 Nobuyoshi Nakada + + * 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 * 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; -- cgit v1.2.3