Merge "Fix another off-by-one error in ZipFileRO" into klp-dev

2013-09-11 22:37:02 +00:00
parent e550446dcf 1c7cf90af4
commit 931f6f8767
1 changed files with 1 additions and 1 deletions
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -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);