From 4bf78945ffe3fe696605a82ffcdcd69a4250667e Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 17 Aug 2015 08:55:00 +0000 Subject: merge revision(s) 51116: [Backport #11324] * 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/branches/ruby_2_1@51614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_transcode.rb | 9 +++++++++ transcode.c | 2 +- version.h | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c576040e01..ad2ca2d9b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 17 17:54:33 2015 Nobuyoshi Nakada + + * transcode.c (rb_econv_set_replacement): target encoding name can + be empty now. [ruby-core:69841] [Bug #11324] + Mon Aug 17 17:52:11 2015 Nobuyoshi Nakada * hash.c (rb_any_hash): fix Float hash. rb_dbl_hash() returns a diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb index 8fc0ee1b9d..d18953dc70 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 1cb5631bce..406301cb8c 100644 --- a/transcode.c +++ b/transcode.c @@ -2201,7 +2201,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; diff --git a/version.h b/version.h index d876bc69fa..ab7224d081 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.7" #define RUBY_RELEASE_DATE "2015-08-17" -#define RUBY_PATCHLEVEL 396 +#define RUBY_PATCHLEVEL 397 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 8 -- cgit v1.2.3