commit 1c7cf90af4d81e609dcb6b0f9afa5787e2a8a344
author Kenny Root <kroot@google.com> Wed Sep 11 15:28:39 2013 -0700
committer Kenny Root <kroot@google.com> Wed Sep 11 15:28:39 2013 -0700
tree c596c9eb53eaa85eedad9eaf284f21d1da66991f
parent d292f790be5074998c1adc5feb4fea031d0d3d09

Fix another off-by-one error in ZipFileRO

Bug: 10424836
Change-Id: I491458bd31ef39e87127d061427b32a3d59ac807

libs/androidfw/ZipFileRO.cpp

diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index 9aceaa95..ec5f95c 100644
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -645,7 +645,7 @@
 
         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);