root
/
rubyzip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle stored files with general purpose bit 3 set 

Signed-off-by: Sam Coward <scoward@pivotal.io>
This commit is contained in:
Andrew Meyer 2018-04-03 16:07:18 -04:00 committed by Sam Coward
parent 05af1231f4
commit c787d94852
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/zip/entry.rb
View File

@ -500,7 +500,7 @@ module Zip
end end
else else
zis = ::Zip::InputStream.new(@zipfile, local_header_offset) zis = ::Zip::InputStream.new(@zipfile, local_header_offset)
zis.instance_variable_set(:@internal, true) zis.instance_variable_set(:@complete_entry, self)
zis.get_next_entry zis.get_next_entry
if block_given? if block_given?
begin begin

6
lib/zip/input_stream.rb
View File

@ -129,7 +129,7 @@ module Zip
end end
if @current_entry && @current_entry.gp_flags & 8 == 8 && @current_entry.crc == 0 \ if @current_entry && @current_entry.gp_flags & 8 == 8 && @current_entry.crc == 0 \
&& @current_entry.compressed_size == 0 \ && @current_entry.compressed_size == 0 \
&& @current_entry.size == 0 && !@internal && @current_entry.size == 0 && !@complete_entry
raise GPFBit3Error, raise GPFBit3Error,
'General purpose flag Bit 3 is set so not possible to get proper info from local header.' \ 'General purpose flag Bit 3 is set so not possible to get proper info from local header.' \
'Please use ::Zip::File instead of ::Zip::InputStream' 'Please use ::Zip::File instead of ::Zip::InputStream'
@ -143,7 +143,11 @@ module Zip
if @current_entry.nil? if @current_entry.nil?
::Zip::NullDecompressor ::Zip::NullDecompressor
elsif @current_entry.compression_method == ::Zip::Entry::STORED elsif @current_entry.compression_method == ::Zip::Entry::STORED
if @current_entry.gp_flags & 8 == 8 && @current_entry.crc == 0 && @current_entry.size == 0 && @complete_entry
::Zip::PassThruDecompressor.new(@archive_io, @complete_entry.size)
else
::Zip::PassThruDecompressor.new(@archive_io, @current_entry.size) ::Zip::PassThruDecompressor.new(@archive_io, @current_entry.size)
end
elsif @current_entry.compression_method == ::Zip::Entry::DEFLATED elsif @current_entry.compression_method == ::Zip::Entry::DEFLATED
header = @archive_io.read(@decrypter.header_bytesize) header = @archive_io.read(@decrypter.header_bytesize)
@decrypter.reset!(header) @decrypter.reset!(header)

BIN
test/data/gpbit3stored.zip Normal file
View File

Binary file not shown.

6
test/file_test.rb
View File

@ -55,6 +55,12 @@ class ZipFileTest < MiniTest::Test
assert_equal(2, zfRead.entries.length) assert_equal(2, zfRead.entries.length)
end end
def test_get_input_stream_stored_with_gpflag_bit3
::Zip::File.open('test/data/gpbit3stored.zip') do |zf|
assert_equal("foo\n", zf.read("foo.txt"))
end
end
def test_get_output_stream def test_get_output_stream
entryCount = nil entryCount = nil
::Zip::File.open(TEST_ZIP.zip_name) do |zf| ::Zip::File.open(TEST_ZIP.zip_name) do |zf|