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

fixed GH #2661: Poco::Zip::ZipArchive cannot load new tomcat.zip file

Browse Source
This commit is contained in:
Günter Obiltschnig 2019-07-24 07:47:01 +02:00
parent 8329020858
commit d25b665194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Zip/src/ZipLocalFileHeader.cpp
View File

@ -126,7 +126,7 @@ void ZipLocalFileHeader::parse(std::istream& inp, bool assumeHeaderRead)
std::memcpy(_rawHeader, HEADER, ZipCommon::HEADER_SIZE); std::memcpy(_rawHeader, HEADER, ZipCommon::HEADER_SIZE);
} }
// read the rest of the header // read the rest of the header
inp.read(_rawHeader + ZipCommon::HEADER_SIZE, FULLHEADER_SIZE - ZipCommon::HEADER_SIZE); inp.read(_rawHeader + ZipCommon::HEADER_SIZE, FULLHEADER_SIZE - ZipCommon::HEADER_SIZE);
poco_assert (_rawHeader[VERSION_POS + 1]>= ZipCommon::HS_FAT && _rawHeader[VERSION_POS + 1] < ZipCommon::HS_UNUSED); poco_assert (_rawHeader[VERSION_POS + 1]>= ZipCommon::HS_FAT && _rawHeader[VERSION_POS + 1] < ZipCommon::HS_UNUSED);
poco_assert (getMajorVersionNumber() <= 4); // Allow for Zip64 version 4.5 poco_assert (getMajorVersionNumber() <= 4); // Allow for Zip64 version 4.5
@ -139,7 +139,7 @@ void ZipLocalFileHeader::parse(std::istream& inp, bool assumeHeaderRead)
inp.read(buf.begin(), len); inp.read(buf.begin(), len);
_fileName = std::string(buf.begin(), len); _fileName = std::string(buf.begin(), len);
} }
if (!searchCRCAndSizesAfterData()) if (!searchCRCAndSizesAfterData())
{ {
_crc32 = getCRCFromHeader(); _crc32 = getCRCFromHeader();
@ -165,8 +165,7 @@ void ZipLocalFileHeader::parse(std::istream& inp, bool assumeHeaderRead)
if (id == ZipCommon::ZIP64_EXTRA_ID) if (id == ZipCommon::ZIP64_EXTRA_ID)
{ {
_forceZip64 = true; _forceZip64 = true;
poco_assert(size >= 8); if (size >= 8 && getUncompressedSizeFromHeader() == ZipCommon::ZIP64_MAGIC)
if (getUncompressedSizeFromHeader() == ZipCommon::ZIP64_MAGIC)
{ {
setUncompressedSize(ZipUtil::get64BitValue(ptr, 0)); setUncompressedSize(ZipUtil::get64BitValue(ptr, 0));
size -= 8; size -= 8;