diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-16 08:17:36 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-16 08:17:36 +0000 |
| commit | d3eeb14db743736428b79ddc4c1d3d8026f15d6f (patch) | |
| tree | 2c8626d744b9167ff5cdcaa2e5127775b3d4d0f6 /lib | |
| parent | 54cab0061e5f458b715f6f21b7f5f8769db61944 (diff) | |
merge revision(s) 61639: [Backport #14323]
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/ftp.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index ee7f029f88..c3ee47ef4d 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -1428,7 +1428,7 @@ module Net s = super(len, String.new, true) return s.empty? ? nil : s else - result = "" + result = String.new while s = super(DEFAULT_BLOCKSIZE, String.new, true) break if s.empty? result << s |