From 6ee82564fac2745e45154938b5b75d9f5ab70b58 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 12 Aug 2017 01:47:09 +0000 Subject: stringio.c: encoding at EOF * ext/stringio/stringio.c (strio_read): should return string with the external encoding, at EOF too. [ruby-core:82349] [Bug #13806] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/stringio/stringio.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ext/stringio') 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 { -- cgit v1.2.3