commit 80805716a409c34203b059f3e03cd934367186c3
author Caolán McNamara <caolanm@redhat.com> Tue Apr 25 12:33:26 2023 +0100
committer Caolán McNamara <caolanm@redhat.com> Tue Apr 25 15:10:15 2023 +0200
tree 8fe63c41798f66da631b2ee3c728b028fa6d597c
parent 2ef83c8782ed947b47f9292a12355fc3bb078078

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>

package/source/zipapi/ZipFile.cxx

diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 27a366c..c1260a7f 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 );
}