diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-04-25 12:33:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-04-25 15:10:15 +0200 |
| commit | 80805716a409c34203b059f3e03cd934367186c3 (patch) | |
| tree | 8fe63c41798f66da631b2ee3c728b028fa6d597c /package/source | |
| parent | 2ef83c8782ed947b47f9292a12355fc3bb078078 (diff) | |
tdf#155005 fail gracefully on encountering a negative compression value
we are using sal_Int64 for this so a large enough value can be
interpreted as negative here
Change-Id: Id547a24591aca4b6ed7b7955621641a0666b0bd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150968
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'package/source')
| -rw-r--r-- | package/source/zipapi/ZipFile.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 27a366c54f95..c1260a7fbf2d 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -1252,6 +1252,12 @@ bool ZipFile::checkSizeAndCRC( const ZipEntry& aEntry ) if( aEntry.nMethod == STORED ) return ( getCRC( aEntry.nOffset, aEntry.nSize ) == aEntry.nCrc ); + if (aEntry.nCompressedSize < 0) + { + SAL_WARN("package", "bogus compressed size of: " << aEntry.nCompressedSize); + return false; + } + getSizeAndCRC( aEntry.nOffset, aEntry.nCompressedSize, &nSize, &nCRC ); return ( aEntry.nSize == nSize && aEntry.nCrc == nCRC ); } |