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

fixed GH #2188: handle directory entries stored with DEFLATE compression method

Browse Source
This commit is contained in:
Günter Obiltschnig 2018-03-06 12:44:40 +01:00
parent 20f9320f2d
commit 27dc684d77
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,7 @@ inline bool ZipFileInfo::isFile() const
inline bool ZipFileInfo::isDirectory() const inline bool ZipFileInfo::isDirectory() const
{ {
poco_assert_dbg(!_fileName.empty()); poco_assert_dbg(!_fileName.empty());
return getUncompressedSize() == 0 && getCompressionMethod() == ZipCommon::CM_STORE && _fileName[_fileName.length()-1] == '/'; return getUncompressedSize() == 0 && _fileName[_fileName.length()-1] == '/';
} }

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

@ -464,7 +464,7 @@ inline bool ZipLocalFileHeader::isFile() const
inline bool ZipLocalFileHeader::isDirectory() const inline bool ZipLocalFileHeader::isDirectory() const
{ {
poco_assert_dbg(!_fileName.empty()); poco_assert_dbg(!_fileName.empty());
return getUncompressedSize() == 0 && getCompressionMethod() == ZipCommon::CM_STORE && _fileName[_fileName.length()-1] == '/'; return getUncompressedSize() == 0 && _fileName[_fileName.length()-1] == '/';
} }

7
Zip/src/Decompress.cpp
View File

@ -86,6 +86,13 @@ bool Decompress::handleZipEntry(std::istream& zipStream, const ZipLocalFileHeade
Poco::File aFile(dir); Poco::File aFile(dir);
aFile.createDirectories(); aFile.createDirectories();
} }
if (hdr.getCompressionMethod() == ZipCommon::CM_DEFLATE)
{
// If directory is stored with deflate method, two extra bytes
// (the result of deflating a zero-length sequence) must be read.
char buffer[2];
zipStream.read(buffer, 2);
}
return true; return true;
} }
try try