diff options
| -rw-r--r-- | ext/stringio/stringio.c | 2 | ||||
| -rw-r--r-- | test/stringio/test_stringio.rb | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 826da86300..032f80a840 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -1392,12 +1392,14 @@ strio_read(int argc, VALUE *argv, VALUE self) case 0: len = RSTRING_LEN(ptr->string); if (len <= ptr->pos) { + rb_encoding *enc = binary ? rb_ascii8bit_encoding() : get_enc(ptr); if (NIL_P(str)) { str = rb_str_new(0, 0); } else { rb_str_resize(str, 0); } + rb_enc_associate(str, enc); return str; } else { diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb index 99548d676d..89fc54e922 100644 --- a/test/stringio/test_stringio.rb +++ b/test/stringio/test_stringio.rb @@ -577,6 +577,13 @@ class TestStringIO < Test::Unit::TestCase s = "0123456789" assert_same(s, f.read(nil, s)) assert_equal("\u3042\u3044", s) + + bug13806 = '[ruby-core:82349] [Bug #13806]' + assert_string("", Encoding::UTF_8, f.read, bug13806) + assert_string("", Encoding::UTF_8, f.read(nil, nil), bug13806) + s.force_encoding(Encoding::US_ASCII) + assert_same(s, f.read(nil, s)) + assert_string("", Encoding::UTF_8, s, bug13806) end def test_readpartial @@ -756,4 +763,8 @@ class TestStringIO < Test::Unit::TestCase assert_equal(0x100000, s.pos) end; end + + def assert_string(content, encoding, str, mesg = nil) + assert_equal([content, encoding], [str, str.encoding], mesg) + end end |