archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 13:04:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

openssl/buffering: fix gets on EOF with limit

Browse source 
* ext/openssl/lib/openssl/buffering.rb (gets):
  avoid comparing fixnum with nil
* test/openssl/test_pair.rb: test gets with limit when EOF is hit
  Thanks to Bar Hofesh <bar.hofesh@safe-t.com> for the bug report
  and testing.
  [ruby-core:70149] [Bug #11400]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2015-08-01 22:08:17 +00:00
parent 9cf11b70ca
commit 1e5a40ff18
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/openssl/lib/openssl/buffering.rb
View file

@ -213,7 +213,7 @@ module OpenSSL::Buffering
else
size = idx ? idx+eol.size : nil
end
if limit and limit >= 0
if size && limit && limit >= 0
size = [size, limit].min
end
consume_rbuff(size)