Bug 1211262: Ensure that STORED entries in ZIP are considered corrupt if compressed and uncompressed sizes differ; r=mwu

This commit is contained in:
Aaron Klotz 2015-10-13 12:20:25 -06:00
parent e795aed8d1
commit b819eb9e0b

View File

@ -841,8 +841,10 @@ MOZ_WIN_MEM_TRY_BEGIN
// -- check if there is enough source data in the file
if (!offset ||
mFd->mLen < aItem->Size() ||
offset > mFd->mLen - aItem->Size())
offset > mFd->mLen - aItem->Size() ||
(aItem->Compression() == STORED && aItem->Size() != aItem->RealSize())) {
return nullptr;
}
return mFd->mFileData + offset;
MOZ_WIN_MEM_TRY_CATCH(return nullptr)