diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_transcode.rb | 9 | ||||
| -rw-r--r-- | transcode.c | 2 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Aug 14 16:30:43 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 Aug 14 15:24:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * 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 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; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.3" #define RUBY_RELEASE_DATE "2015-08-14" -#define RUBY_PATCHLEVEL 166 +#define RUBY_PATCHLEVEL 167 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 8 |