Skip to content

Fix ZipInputStream cannot read STORED method from ZipZap #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix ZipInputStream cannot read STORED method from ZipZap #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions ZipZap/ZZNewArchiveEntryWriter.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,12 @@ - (instancetype)initWithFileName:(NSString*)fileName
}

// use data descriptor for crc + size if any blocks provided
ZZGeneralPurposeBitFlag sizeInDataDescriptorFlag = dataBlock || streamBlock || dataConsumerBlock ? ZZGeneralPurposeBitFlag::sizeInDataDescriptor : ZZGeneralPurposeBitFlag::none;
// However, if dataBlock is provided, we don't use the data descriptor.
// This is because on Android / Java, ZipInputStream cannot support STORED
// method with data descriptor. We need to put the crc32 and file size
// upfront in local file header. However, for us, this is only zero cost if
// we use data block.
ZZGeneralPurposeBitFlag sizeInDataDescriptorFlag = ((dataBlock && compressionLevel != 0) || streamBlock || dataConsumerBlock) ? ZZGeneralPurposeBitFlag::sizeInDataDescriptor : ZZGeneralPurposeBitFlag::none;
centralFileHeader->generalPurposeBitFlag = localFileHeader->generalPurposeBitFlag = compressionFlag | sizeInDataDescriptorFlag | ZZGeneralPurposeBitFlag::languageEncoding;

centralFileHeader->compressionMethod = localFileHeader->compressionMethod = compressionLevel ? ZZCompressionMethod::deflated : ZZCompressionMethod::stored;
Expand Down Expand Up @@ -184,10 +189,7 @@ - (BOOL)writeLocalFileToChannelOutput:(id<ZZChannelOutput>)channelOutput

// save current offset, then write out all of local file to the file handle
centralFileHeader->relativeOffsetOfLocalHeader = [channelOutput offset] + initialSkip;
if (![channelOutput writeData:_localFileHeader
error:error])
return NO;


ZZDataDescriptor dataDescriptor;
dataDescriptor.signature = ZZDataDescriptor::sign;
dataDescriptor.crc32 = 0;
Expand All @@ -205,6 +207,10 @@ ZZScopeGuard errorChecker(^

if (_compressionLevel)
{
// Write the local file header.
if (![channelOutput writeData:_localFileHeader
error:error])
return NO;
// use of one the blocks to write to a stream that deflates directly to the output file handle
ZZDeflateOutputStream* outputStream = [[ZZDeflateOutputStream alloc] initWithChannelOutput:channelOutput
compressionLevel:_compressionLevel];
Expand Down Expand Up @@ -269,11 +275,18 @@ ZZScopeGuard errorChecker(^
{
// if data block, write the data directly to output file handle
NSData* data = _dataBlock(&err);
if (data && [channelOutput writeData:data error:&err])
if (data)
{
dataDescriptor.compressedSize = dataDescriptor.uncompressedSize = (uint32_t)data.length;
dataDescriptor.crc32 = (uint32_t)crc32(0, (const Bytef*)data.bytes, dataDescriptor.uncompressedSize);
bad = NO;
ZZLocalFileHeader *localFileHeader = [self localFileHeader];
localFileHeader->crc32 = dataDescriptor.crc32;
localFileHeader->compressedSize = dataDescriptor.compressedSize;
localFileHeader->uncompressedSize = dataDescriptor.uncompressedSize;
// Successfully write out the local file header and the actual data.
if ([channelOutput writeData:_localFileHeader error:&err] &&
[channelOutput writeData:data error:&err])
bad = NO;
}
}

Expand All @@ -285,6 +298,10 @@ ZZScopeGuard errorChecker(^
}
else
{
// Write the local file header.
if (![channelOutput writeData:_localFileHeader
error:error])
return NO;
// if stream block, data consumer block or no block, use to write to a stream that just outputs to the output file handle
ZZStoreOutputStream* outputStream = [[ZZStoreOutputStream alloc] initWithChannelOutput:channelOutput];

Expand Down Expand Up @@ -317,6 +334,9 @@ ZZScopeGuard errorChecker(^
centralFileHeader->compressedSize = dataDescriptor.compressedSize;
centralFileHeader->uncompressedSize = dataDescriptor.uncompressedSize;
if ((_dataBlock || _streamBlock || _dataConsumerBlock) &&
// Only write data descriptor if we don't have size in data descriptor.
(centralFileHeader->generalPurposeBitFlag & ZZGeneralPurposeBitFlag::sizeInDataDescriptor) !=
ZZGeneralPurposeBitFlag::none &&
![channelOutput writeData:[NSData dataWithBytesNoCopy:&dataDescriptor
length:sizeof(dataDescriptor)
freeWhenDone:NO]
Expand Down