Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b203dc13 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am efbfe81d: am 931f6f87: Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 

* commit 'efbfe81d':
  Fix another off-by-one error in ZipFileRO
parents ed3544a6 efbfe81d

libs/androidfw/ZipFileRO.cpp

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ bool ZipFileRO::getEntryInfo(ZipEntryRO entry, int* pMethod, size_t* pUncompLen, 


        if (method == kCompressStored &&

            ((dataOffset >= cdOffset) ||

             (uncompLen >= (cdOffset - dataOffset))))

             (uncompLen > (cdOffset - dataOffset))))

        {

            ALOGE("ERROR: bad uncompressed length in zip (%ld + " ZD " > %ld)\n",

                (long) dataOffset, (ZD_TYPE) uncompLen, (long) cdOffset);