commit de3ff60d5a30c7a3d157ac95b2f7985aaae73a25
author Narayan Kamath <narayan@google.com> Fri Jun 06 10:30:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 06 10:30:49 2014 +0000
tree 42d87177b3990697d45175483e76f0c321155560
parent 141e35034a8da26b7bf47ee69a847f7cbc350688
parent b7b92ae22c172bbeb7af0d1e1efea9ee24976460

am b7b92ae2: Merge "Fix build."

* commit 'b7b92ae22c172bbeb7af0d1e1efea9ee24976460':
  Fix build.

libziparchive/zip_archive.cc

diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index a30b9a0..df5e3bd 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -382,9 +382,9 @@
   const off64_t dir_offset = get4LE(eocd_ptr + kEOCDFileOffset);
   const uint16_t comment_length = get2LE(eocd_ptr + kEOCDCommentLen);
 
-  if (eocd_offset + comment_length + kEOCDCommentOffset != file_length) {
+  if (eocd_offset + comment_length + kEOCDComment != file_length) {
     ALOGW("Zip: %" PRId64 " extraneous bytes at the end of the central directory",
-          (int64_t) (file_length - (eocd_offset + comment_length + kEOCDCommentOffset)));
+          (int64_t) (file_length - (eocd_offset + comment_length + kEOCDComment)));
     return kInvalidFile;
   }