kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

io.c: read more data

Browse source 
* io.c (rb_io_each_codepoint): read more data when read partially.
  [ruby-core:70379] [Bug #11444]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-08-15 01:15:22 +00:00
parent 14470aa6db
commit cfa7550b66
3 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Aug 15 10:15:20 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_each_codepoint): read more data when read partially.
[ruby-core:70379] [Bug #11444]
Sat Aug 15 04:33:39 2015 Eric Wong <e@80x24.org>
* hash.c (any_hash): skip rb_objid_hash for static syms

17
io.c
View file

@ -3763,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;
}

20
test/ruby/test_io_m17n.rb
View file

@ -2562,4 +2562,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