Fixing Zip#read_local_entry error on JRuby

securityroots · Mar 7, 2015 · b7fa9b1 · b7fa9b1
1 parent 61a4435
commit b7fa9b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ Gemfile.lock
 +samples/*.zip.*
 coverage
 pkg/
+.ruby-gemset
+.ruby-version
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
@@ -221,7 +221,7 @@ def unpack_local_entry(buf)
     def read_local_entry(io) #:nodoc:all
       @local_header_offset = io.tell
 
-      static_sized_fields_buf = io.read(::Zip::LOCAL_ENTRY_STATIC_HEADER_LENGTH)
+      static_sized_fields_buf = io.read(::Zip::LOCAL_ENTRY_STATIC_HEADER_LENGTH) || ''
 
       unless static_sized_fields_buf.bytesize == ::Zip::LOCAL_ENTRY_STATIC_HEADER_LENGTH
         raise Error, "Premature end of file. Not enough data for zip entry local header"