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

This commit is contained in:
Günter Obiltschnig
2019-07-24 07:42:31 +02:00
parent cf1966e855
commit 53fe9942a5

View File

@@ -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;