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

* commit '931f6f8767ee3b234914763262f1580695bcb208':
  Fix another off-by-one error in ZipFileRO
This commit is contained in:
Kenny Root
2013-09-11 15:40:06 -07:00
committed by Android Git Automerger

View File

@@ -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);