generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-21 15:51:43 +02:00
Code Issues Projects Releases Wiki Activity

fixed GH #1597: adding empty file to zip leads to archive that can't be unzipped by windows

Browse Source
This commit is contained in:
Guenter Obiltschnig
2017-02-17 15:32:01 +01:00
parent 7c81a551c4
commit 4ddce11dc0
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zip/include/Poco/Zip/ZipLocalFileHeader.h
View File

@@ -190,6 +190,8 @@ private:
Poco::UInt32 _crc32; Poco::UInt32 _crc32;
Poco::UInt32 _compressedSize; Poco::UInt32 _compressedSize;
Poco::UInt32 _uncompressedSize; Poco::UInt32 _uncompressedSize;
friend class ZipStreamBuf;
}; };

7
Zip/src/ZipStream.cpp
View File

@@ -219,6 +219,13 @@ void ZipStreamBuf::close()
_pHeader->setCRC(_crc32.checksum()); _pHeader->setCRC(_crc32.checksum());
_pHeader->setUncompressedSize(_bytesWritten); _pHeader->setUncompressedSize(_bytesWritten);
_pHeader->setCompressedSize(_ptrOHelper->bytesWritten()); _pHeader->setCompressedSize(_ptrOHelper->bytesWritten());
if (_bytesWritten == 0)
{
poco_assert (_ptrOHelper->bytesWritten() == 0);
// Empty files must use CM_STORE, otherwise unzipping will fail
_pHeader->setCompressionMethod(ZipCommon::CM_STORE);
_pHeader->setCompressionLevel(ZipCommon::CL_NORMAL);
}
_pHeader->setStartPos(_pHeader->getStartPos()); // This resets EndPos now that compressed Size is known _pHeader->setStartPos(_pHeader->getStartPos()); // This resets EndPos now that compressed Size is known
if (_pHeader->searchCRCAndSizesAfterData()) if (_pHeader->searchCRCAndSizesAfterData())