commit 50afc159b3bba06cd02648b1e287ba06d4fac059
author Mykola Kondratenko <mykola.kondratenko@sonymobile.com> Mon Sep 08 12:46:37 2014 +0200
committer Narayan Kamath <narayan@google.com> Thu Mar 19 09:28:41 2015 +0000
tree 2e4191bc43a861ae72e7c4c8d072972c8884f164
parent ee2e362f8be4cbf68bb38fa1916a1f395677c593

libziparchive: fix issue with a directory with one file

libziparchive fails to iterate some bootanimation archives
reporting invalid offset error. This is caused by failure
to process a directory with one file
(when name_offset + file_name_length == cd_offset).

Change-Id: I2733e7f782c14a6fadd5491bb94318ac968df206

libziparchive/zip_archive.cc

diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index e820f2a..6475649 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -824,7 +824,7 @@
   // name in the central directory.
   if (lfh->file_name_length == nameLen) {
     const off64_t name_offset = local_header_offset + sizeof(LocalFileHeader);
-    if (name_offset + lfh->file_name_length >= cd_offset) {
+    if (name_offset + lfh->file_name_length > cd_offset) {
       ALOGW("Zip: Invalid declared length");
       return kInvalidOffset;
     }