diff options
-rw-r--r-- | lib/net/ftp.rb | 2 | ||||
-rw-r--r-- | test/net/ftp/test_buffered_socket.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index bd74323987..31f93b8b34 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -1434,7 +1434,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 diff --git a/test/net/ftp/test_buffered_socket.rb b/test/net/ftp/test_buffered_socket.rb index 3cc46fa555..875c53f4e0 100644 --- a/test/net/ftp/test_buffered_socket.rb +++ b/test/net/ftp/test_buffered_socket.rb @@ -33,6 +33,12 @@ class BufferedSocketTest < Test::Unit::TestCase 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) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.4" #define RUBY_RELEASE_DATE "2018-03-21" -#define RUBY_PATCHLEVEL 275 +#define RUBY_PATCHLEVEL 276 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 |