archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 61639: [Backport #14323]

Browse source 
net/ftp: fix FrozenError in BufferedSocket

	I noticed this bug while working on something else with
	RUBYOPT=-d on, existing test cases all passed with it.

	Note: I use String.new because it is the local style, here,
	I prefer +'' (or ''.b, for a future commit)

	* lib/net/ftp.rb (BufferedSocket#read): use String.new
	* test/net/ftp/test_buffered_socket.rb (test_read_nil): new test
	  [ruby-core:84675] [Bug #14323]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-02-16 08:17:36 +00:00
parent 54cab0061e
commit d3eeb14db7
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/net/ftp.rb
View file

@ -1428,7 +1428,7 @@ module Net
s = super(len, String.new, true) s = super(len, String.new, true)
return s.empty? ? nil : s return s.empty? ? nil : s
else else
result = "" result = String.new
while s = super(DEFAULT_BLOCKSIZE, String.new, true) while s = super(DEFAULT_BLOCKSIZE, String.new, true)
break if s.empty? break if s.empty?
result << s result << s

6
test/net/ftp/test_buffered_socket.rb
View file

@ -33,6 +33,12 @@ class BufferedSocketTest < Test::Unit::TestCase
assert_equal("bar", sock.gets) assert_equal("bar", sock.gets)
end end
def test_read_nil
sock = create_buffered_socket("foo\nbar")
assert_equal("foo\nbar", sock.read)
assert_equal("", sock.read)
end
private private
def create_buffered_socket(s) def create_buffered_socket(s)

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.0" #define RUBY_VERSION "2.5.0"
#define RUBY_RELEASE_DATE "2018-02-16" #define RUBY_RELEASE_DATE "2018-02-16"
#define RUBY_PATCHLEVEL 15 #define RUBY_PATCHLEVEL 16
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2