ruby-changes:35634
From: nobu <ko1@a...>
Date: Fri, 26 Sep 2014 12:52:54 +0900 (JST)
Subject: [ruby-changes:35634] nobu:r47716 (trunk): stringio.c: ASCII-8BIT StringIO rejects no encodings
nobu 2014-09-26 12:52:37 +0900 (Fri, 26 Sep 2014) New Revision: 47716 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47716 Log: stringio.c: ASCII-8BIT StringIO rejects no encodings * ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO should be writable any encoding strings, without conversion. [ruby-core:65240] [Bug #10285] Modified files: trunk/ChangeLog trunk/ext/stringio/stringio.c trunk/test/stringio/test_stringio.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 47715) +++ ChangeLog (revision 47716) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Fri Sep 26 12:52:36 2014 Nobuyoshi Nakada <nobu@r...> + + * ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO + should be writable any encoding strings, without conversion. + [ruby-core:65240] [Bug #10285] + Fri Sep 26 05:21:01 2014 Eric Wong <e@8...> * object.c (rb_class_real): do not dereference 0 VALUE Index: ext/stringio/stringio.c =================================================================== --- ext/stringio/stringio.c (revision 47715) +++ ext/stringio/stringio.c (revision 47716) @@ -1169,12 +1169,13 @@ strio_write(VALUE self, VALUE str) https://github.com/ruby/ruby/blob/trunk/ext/stringio/stringio.c#L1169 struct StringIO *ptr = writable(self); long len, olen; rb_encoding *enc, *enc2; + rb_encoding *const ascii8bit = rb_ascii8bit_encoding(); if (!RB_TYPE_P(str, T_STRING)) str = rb_obj_as_string(str); enc = rb_enc_get(ptr->string); enc2 = rb_enc_get(str); - if (enc != enc2 && enc != rb_ascii8bit_encoding()) { + if (enc != enc2 && enc != ascii8bit) { str = rb_str_conv_enc(str, enc2, enc); } len = RSTRING_LEN(str); @@ -1185,7 +1186,7 @@ strio_write(VALUE self, VALUE str) https://github.com/ruby/ruby/blob/trunk/ext/stringio/stringio.c#L1186 ptr->pos = olen; } if (ptr->pos == olen) { - if (enc2 == rb_ascii8bit_encoding()) { + if (enc == ascii8bit || enc2 == ascii8bit) { rb_enc_str_buf_cat(ptr->string, RSTRING_PTR(str), len, enc); OBJ_INFECT(ptr->string, str); } Index: test/stringio/test_stringio.rb =================================================================== --- test/stringio/test_stringio.rb (revision 47715) +++ test/stringio/test_stringio.rb (revision 47716) @@ -137,6 +137,18 @@ class TestStringIO < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/test/stringio/test_stringio.rb#L137 assert_equal(Encoding::UTF_8, s.encoding, "honor the original encoding over ASCII-8BIT") end + def test_set_encoding + bug10285 = '[ruby-core:65240] [Bug #10285]' + f = StringIO.new() + f.set_encoding(Encoding::ASCII_8BIT) + f.write("quz \x83 mat".b) + s = "foo \x97 bar".force_encoding(Encoding::WINDOWS_1252) + assert_nothing_raised(Encoding::CompatibilityError, bug10285) { + f.write(s) + } + assert_equal(Encoding::ASCII_8BIT, f.string.encoding, bug10285) + end + def test_mode_error f = StringIO.new("", "r") assert_raise(IOError) { f.write("foo") } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/