Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 10ccc3266e 931f6f8767
commit efbfe81d26
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/androidfw/ZipFileRO.cpp
View File

@@ -645,7 +645,7 @@ bool ZipFileRO::getEntryInfo(ZipEntryRO entry, int* pMethod, size_t* pUncompLen,
if (method == kCompressStored && if (method == kCompressStored &&
((dataOffset >= cdOffset) || ((dataOffset >= cdOffset) ||
(uncompLen >= (cdOffset - dataOffset)))) (uncompLen > (cdOffset - dataOffset))))
{ {
ALOGE("ERROR: bad uncompressed length in zip (%ld + " ZD " > %ld)\n", ALOGE("ERROR: bad uncompressed length in zip (%ld + " ZD " > %ld)\n",
(long) dataOffset, (ZD_TYPE) uncompLen, (long) cdOffset); (long) dataOffset, (ZD_TYPE) uncompLen, (long) cdOffset);