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 (rb_io_eof): use eof() instead of io_fillbuf(). It's because

Browse source 
io_unread() doesn't work properly when reading CRLF with read(length)
  and mode 'r'.
  [ruby-core:44189][Bug #6271]

* test/ruby/test_io_m17n.rb (TestIO_M17N#test_read_crlf_and_eof):
  test for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shirosaki 2012-04-11 12:05:19 +00:00
parent 3e13081214
commit 2f7290d4b3
3 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Wed Apr 11 20:28:36 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* io.c (rb_io_eof): use eof() instead of io_fillbuf(). It's because
io_unread() doesn't work properly when reading CRLF with read(length)
and mode 'r'.
[ruby-core:44189][Bug #6271]
* test/ruby/test_io_m17n.rb (TestIO_M17N#test_read_crlf_and_eof):
test for above.
Wed Apr 11 07:38:33 2012 Eric Hodel <drbrain@segment7.net>
* ext/digest/sha2/lib/sha2.rb (Digest#block_length): Fixed method name

5
io.c
View file

@ -1614,6 +1614,11 @@ rb_io_eof(VALUE io)
if (READ_CHAR_PENDING(fptr)) return Qfalse;
if (READ_DATA_PENDING(fptr)) return Qfalse;
READ_CHECK(fptr);
#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
if (!NEED_READCONV(fptr) && NEED_NEWLINE_DECORATOR_ON_READ(fptr)) {
return eof(fptr->fd) ? Qtrue : Qfalse;
}
#endif
if (io_fillbuf(fptr) < 0) {
return Qtrue;
}

16
test/ruby/test_io_m17n.rb
View file

@ -2430,4 +2430,20 @@ EOT
end
}
end if /mswin|mingw/ =~ RUBY_PLATFORM
def test_read_crlf_and_eof
bug6271 = '[ruby-core:44189]'
with_tmpdir {
str = "a\r\nb\r\nc\r\n"
generate_file("tmp", str)
open("tmp", "r") do |f|
i = 0
until f.eof?
assert_equal(str[i], f.read(1), bug6271)
i += 1
end
assert_equal(str.size, i, bug6271)
end
}
end if /mswin|mingw/ =~ RUBY_PLATFORM
end