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

Merge pull request #1218 from stracol/patch-1

Browse Source 
Fixes crash on streamed unzip
This commit is contained in:
Aleksandar Fabijanic 2016-03-29 22:01:43 -07:00
commit f11bf77505
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Zip/src/ZipDataInfo.cpp
View File

@ -41,9 +41,15 @@ ZipDataInfo::ZipDataInfo(std::istream& in, bool assumeHeaderRead):
_valid(false) _valid(false)
{ {
if (assumeHeaderRead) if (assumeHeaderRead)
{
std::memcpy(_rawInfo, HEADER, ZipCommon::HEADER_SIZE); std::memcpy(_rawInfo, HEADER, ZipCommon::HEADER_SIZE);
}
else else
{
in.read(_rawInfo, ZipCommon::HEADER_SIZE); in.read(_rawInfo, ZipCommon::HEADER_SIZE);
if ((! in) || (in.gcount() != ZipCommon::HEADER_SIZE))
return;
}
poco_assert (std::memcmp(_rawInfo, HEADER, ZipCommon::HEADER_SIZE) == 0); poco_assert (std::memcmp(_rawInfo, HEADER, ZipCommon::HEADER_SIZE) == 0);
// now copy the rest of the header // now copy the rest of the header
in.read(_rawInfo+ZipCommon::HEADER_SIZE, FULLHEADER_SIZE - ZipCommon::HEADER_SIZE); in.read(_rawInfo+ZipCommon::HEADER_SIZE, FULLHEADER_SIZE - ZipCommon::HEADER_SIZE);
@ -75,9 +81,15 @@ ZipDataInfo64::ZipDataInfo64(std::istream& in, bool assumeHeaderRead):
_valid(false) _valid(false)
{ {
if (assumeHeaderRead) if (assumeHeaderRead)
{
std::memcpy(_rawInfo, HEADER, ZipCommon::HEADER_SIZE); std::memcpy(_rawInfo, HEADER, ZipCommon::HEADER_SIZE);
}
else else
{
in.read(_rawInfo, ZipCommon::HEADER_SIZE); in.read(_rawInfo, ZipCommon::HEADER_SIZE);
if ((! in) || (in.gcount() != ZipCommon::HEADER_SIZE))
return;
}
poco_assert (std::memcmp(_rawInfo, HEADER, ZipCommon::HEADER_SIZE) == 0); poco_assert (std::memcmp(_rawInfo, HEADER, ZipCommon::HEADER_SIZE) == 0);
// now copy the rest of the header // now copy the rest of the header
in.read(_rawInfo+ZipCommon::HEADER_SIZE, FULLHEADER_SIZE - ZipCommon::HEADER_SIZE); in.read(_rawInfo+ZipCommon::HEADER_SIZE, FULLHEADER_SIZE - ZipCommon::HEADER_SIZE);