diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-31 14:58:24 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-31 14:58:24 +0000 |
commit | 7a27746ecebbfee90203e8f3816e6e80d6c65d3b (patch) | |
tree | 4645e9b2f87e0d066840bb9f00a25d20f36fc0fd | |
parent | f86e5daee790ee509cb17f4f51f95cc76ca89a4e (diff) |
merge revision(s) 67188: [Backport #15642]
io.c: chomp CR at the end of read buffer
* io.c (rb_io_getline_fast): chomp CR followed by LF but separated
by the read buffer boundary. [ruby-core:91707] [Bug #15642]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@67391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | io.c | 6 | ||||
-rw-r--r-- | test/ruby/test_io.rb | 13 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 22 insertions, 3 deletions
@@ -3017,6 +3017,12 @@ rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc, int chomp) read_buffered_data(RSTRING_PTR(str)+len, pending - chomplen, fptr); fptr->rbuf.off += chomplen; fptr->rbuf.len -= chomplen; + if (pending == 1 && chomplen == 1 && len > 0) { + if (RSTRING_PTR(str)[len-1] == '\r') { + rb_str_resize(str, --len); + break; + } + } } len += pending - chomplen; if (cr != ENC_CODERANGE_BROKEN) diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index dc99a8c463..200db7a9f5 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -228,6 +228,19 @@ class TestIO < Test::Unit::TestCase assert_nil r.gets r.close end) + + (0..3).each do |i| + pipe(proc do |w| + w.write("a" * ((4096 << i) - 4) + "\r\n" "a\r\n") + w.close + end, + proc do |r| + r.gets + assert_equal "a", r.gets(chomp: true) + assert_nil r.gets + r.close + end) + end end def test_gets_chomp_rs_nil @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.6" -#define RUBY_RELEASE_DATE "2019-03-19" -#define RUBY_PATCHLEVEL 352 +#define RUBY_RELEASE_DATE "2019-03-31" +#define RUBY_PATCHLEVEL 353 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" |