ruby-changes:50760
From: usa <ko1@a...>
Date: Wed, 28 Mar 2018 14:41:59 +0900 (JST)
Subject: [ruby-changes:50760] usa:r62943 (ruby_2_3): merge revision(s) 61639: [Backport #14323]
usa 2018-03-28 14:41:54 +0900 (Wed, 28 Mar 2018) New Revision: 62943 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62943 Log: 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 [Bug #14323] Modified directories: branches/ruby_2_3/ Modified files: branches/ruby_2_3/ChangeLog branches/ruby_2_3/lib/net/ftp.rb branches/ruby_2_3/test/net/ftp/test_buffered_socket.rb branches/ruby_2_3/version.h Index: ruby_2_3/test/net/ftp/test_buffered_socket.rb =================================================================== --- ruby_2_3/test/net/ftp/test_buffered_socket.rb (revision 62942) +++ ruby_2_3/test/net/ftp/test_buffered_socket.rb (revision 62943) @@ -33,6 +33,12 @@ class BufferedSocketTest < Test::Unit::T https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/net/ftp/test_buffered_socket.rb#L33 assert_equal("bar", sock.gets) end + def test_read_nil + sock = create_buffered_socket("foo\nbar") + assert_equal("foo\nbar", sock.read) + assert_equal("", sock.read) + end + private def create_buffered_socket(s) Index: ruby_2_3/lib/net/ftp.rb =================================================================== --- ruby_2_3/lib/net/ftp.rb (revision 62942) +++ ruby_2_3/lib/net/ftp.rb (revision 62943) @@ -1297,7 +1297,7 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/net/ftp.rb#L1297 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 Index: ruby_2_3/ChangeLog =================================================================== --- ruby_2_3/ChangeLog (revision 62942) +++ ruby_2_3/ChangeLog (revision 62943) @@ -1,3 +1,17 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1 +Sun Mar 28 14:40:25 2018 Eric Wong <normalperson@y...> + + 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 + [Bug #14323] + Thu Mar 28 14:29:26 2018 Nobuyoshi Nakada <nobu@r...> clean autogenerated files Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 62942) +++ ruby_2_3/version.h (revision 62943) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-03-28" -#define RUBY_PATCHLEVEL 439 +#define RUBY_PATCHLEVEL 440 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_3 =================================================================== --- ruby_2_3 (revision 62942) +++ ruby_2_3 (revision 62943) Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r61639 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/