diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | io.c | 5 | ||||
| -rw-r--r-- | test/ruby/test_io_m17n.rb | 16 |
3 files changed, 31 insertions, 0 deletions
@@ -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 @@ -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; } diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index b6c6215371..be5bacf688 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -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 |