summaryrefslogtreecommitdiffstats
path: root/libs/androidfw
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-09-11 15:28:39 -0700
committerKenny Root <kroot@google.com>2013-09-11 15:28:39 -0700
commit1c7cf90af4d81e609dcb6b0f9afa5787e2a8a344 (patch)
treec596c9eb53eaa85eedad9eaf284f21d1da66991f /libs/androidfw
parentd292f790be5074998c1adc5feb4fea031d0d3d09 (diff)
downloadframeworks_base-1c7cf90af4d81e609dcb6b0f9afa5787e2a8a344.zip
frameworks_base-1c7cf90af4d81e609dcb6b0f9afa5787e2a8a344.tar.gz
frameworks_base-1c7cf90af4d81e609dcb6b0f9afa5787e2a8a344.tar.bz2
Fix another off-by-one error in ZipFileRO
Bug: 10424836 Change-Id: I491458bd31ef39e87127d061427b32a3d59ac807
Diffstat (limited to 'libs/androidfw')
-rw-r--r--libs/androidfw/ZipFileRO.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index 9aceaa9..ec5f95c 100644
--- 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);