generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-04 20:31:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix zip files made with non-seekable output. (issue #335)

Browse Source
This commit is contained in:
Simon Sasburg
2015-10-07 20:30:34 +01:00
parent 6fb7dd8bf7
commit ca1af32ecc
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Zip/src/ZipFileInfo.cpp
View File

@@ -55,6 +55,9 @@ ZipFileInfo::ZipFileInfo(const ZipLocalFileHeader& header):
setUnixAttributes(); setUnixAttributes();
_rawInfo[GENERAL_PURPOSE_POS+1] |= 0x08; // Set "language encoding flag" to indicate that filenames and paths are in UTF-8. _rawInfo[GENERAL_PURPOSE_POS+1] |= 0x08; // Set "language encoding flag" to indicate that filenames and paths are in UTF-8.
if (header.searchCRCAndSizesAfterData())
_rawInfo[GENERAL_PURPOSE_POS] |= 0x08;
} }

11
Zip/src/ZipStream.cpp
View File

@@ -218,6 +218,12 @@ void ZipStreamBuf::close(Poco::UInt64& extraDataSize)
poco_assert (*_pOstr); poco_assert (*_pOstr);
// write an extra datablock if required // write an extra datablock if required
// or fix the crc entries // or fix the crc entries
poco_check_ptr(_pHeader);
_pHeader->setCRC(_crc32.checksum());
_pHeader->setUncompressedSize(_bytesWritten);
_pHeader->setCompressedSize(_ptrOHelper->bytesWritten());
_pHeader->setStartPos(_pHeader->getStartPos()); // This resets EndPos now that compressed Size is known
if (_pHeader->searchCRCAndSizesAfterData()) if (_pHeader->searchCRCAndSizesAfterData())
{ {
if (_pHeader->needsZip64()) if (_pHeader->needsZip64())
@@ -241,13 +247,8 @@ void ZipStreamBuf::close(Poco::UInt64& extraDataSize)
} }
else else
{ {
poco_check_ptr (_pHeader);
_pHeader->setCRC(_crc32.checksum());
_pHeader->setUncompressedSize(_bytesWritten);
_pHeader->setCompressedSize(_ptrOHelper->bytesWritten());
_pOstr->seekp(_pHeader->getStartPos(), std::ios_base::beg); _pOstr->seekp(_pHeader->getStartPos(), std::ios_base::beg);
poco_assert (*_pOstr); poco_assert (*_pOstr);
_pHeader->setStartPos(_pHeader->getStartPos()); // This resets EndPos now that compressed Size is known
if (_pHeader->hasExtraField()) // Update sizes in header extension. if (_pHeader->hasExtraField()) // Update sizes in header extension.
_pHeader->setZip64Data(); _pHeader->setZip64Data();
std::string header = _pHeader->createHeader(); std::string header = _pHeader->createHeader();