diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | io.c | 18 | ||||
| -rw-r--r-- | test/ruby/test_io_m17n.rb | 20 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 44 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Nov 29 17:13:16 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_each_codepoint): read more data when read partially. + [ruby-core:70379] [Bug #11444] + Sun Nov 29 16:46:25 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> * lib/net/http.rb: set hostname before call ossl_ssl_set_session. @@ -3708,6 +3708,7 @@ rb_io_each_codepoint(VALUE io) READ_CHECK(fptr); if (NEED_READCONV(fptr)) { SET_BINARY_MODE(fptr); + r = 1; /* no invalid char yet */ for (;;) { make_readconv(fptr, 0); for (;;) { @@ -3762,8 +3763,25 @@ rb_io_each_codepoint(VALUE io) rb_yield(UINT2NUM(c)); } else if (MBCLEN_INVALID_P(r)) { + invalid: rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc)); } + else if (MBCLEN_NEEDMORE_P(r)) { + char cbuf[8], *p = cbuf; + int more = MBCLEN_NEEDMORE_LEN(r); + if (more > numberof(cbuf)) goto invalid; + more += n = fptr->rbuf.len; + if (more > numberof(cbuf)) goto invalid; + while ((n = (int)read_buffered_data(p, more, fptr)) > 0 && + (p += n, (more -= n) > 0)) { + if (io_fillbuf(fptr) < 0) goto invalid; + if ((n = fptr->rbuf.len) > more) n = more; + } + r = rb_enc_precise_mbclen(cbuf, p, enc); + if (!MBCLEN_CHARFOUND_P(r)) goto invalid; + c = rb_enc_codepoint(cbuf, p, enc); + rb_yield(UINT2NUM(c)); + } else { continue; } diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index 734b0172ac..17a427a12b 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -2563,4 +2563,24 @@ EOT a.close rescue nil b.close rescue nil end + + def test_each_codepoint_need_more + code = <<-'end;' + c = nil + begin + STDIN.set_encoding(Encoding::UTF_8).each_codepoint{|i| c = i} + rescue ArgumentError => e + STDERR.puts e.message + else + printf "%x", c + end + end; + args = ['-e', code] + bug11444 = '[ruby-core:70379] [Bug #11444]' + assert_in_out_err(args, "\u{1f376}".b[0,3], [], + ["invalid byte sequence in UTF-8"], + bug11444, timeout: 1) + assert_in_out_err(args, "x"*8190+"\u{1f376}", ["1f376"], [], + bug11444, timeout: 1) + end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.4" #define RUBY_RELEASE_DATE "2015-11-29" -#define RUBY_PATCHLEVEL 211 +#define RUBY_PATCHLEVEL 212 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 11 |