Mimic IO#read return values in Decompressor#read

rubyzip · jdleesmiller · Feb 1, 2020 · Dec 29, 2019 · Dec 29, 2019 · Dec 21, 2019
commit 456bd4d92c995dd92cd74286bd6bdde7cc3057ef
diff --git a/lib/zip/inflater.rb b/lib/zip/inflater.rb
@@ -5,17 +5,16 @@ def initialize(*args)
 
       @buffer = ''.dup
       @zlib_inflater = ::Zlib::Inflate.new(-Zlib::MAX_WBITS)
-      @has_returned_empty_string = false
     end
 
     def read(length = nil, outbuf = '')
+      return ((length.nil? || length.zero?) ? "" : nil) if eof
+
       while length.nil? || (@buffer.bytesize < length)
         break if input_finished?
         @buffer << produce_input
       end
 
-      return value_when_finished if eof?
-
       outbuf.replace(@buffer.slice!(0...(length || @buffer.bytesize)))
     end
 
@@ -43,12 +42,6 @@ def produce_input
     def input_finished?
       @zlib_inflater.finished?
     end
-
-    def value_when_finished # mimic behaviour of ruby File object.
-      return if @has_returned_empty_string
-      @has_returned_empty_string = true
-      ''
-    end
   end
 end
 

diff --git a/lib/zip/pass_thru_decompressor.rb b/lib/zip/pass_thru_decompressor.rb
@@ -3,16 +3,10 @@ class PassThruDecompressor < Decompressor #:nodoc:all
     def initialize(*args)
       super
       @read_so_far = 0
-      @has_returned_empty_string = false
     end
 
     def read(length = nil, outbuf = '')
-      if eof?
-        has_returned_empty_string_val = @has_returned_empty_string
-        @has_returned_empty_string = true
-        return '' unless has_returned_empty_string_val
-        return
-      end
+      return ((length.nil? || length.zero?) ? "" : nil) if eof
 
       if length.nil? || (@read_so_far + length) > decompressed_size
         length = decompressed_size - @read_so_far