diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-06 10:47:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-06 10:47:00 +0000 |
| commit | 8eb268fe2b7c1a826e299f9e3b87440cdcb3303b (patch) | |
| tree | 4a8e97356371bade341ec7dc8d438b8b734b2484 | |
| parent | 370c3a05b53463f2afee524c8cc13a2d6804b0fa (diff) | |
| parent | 5ceec65d6482c472d6b55368d02f9f0d3992727c (diff) | |
| download | system_core-8eb268fe2b7c1a826e299f9e3b87440cdcb3303b.zip system_core-8eb268fe2b7c1a826e299f9e3b87440cdcb3303b.tar.gz system_core-8eb268fe2b7c1a826e299f9e3b87440cdcb3303b.tar.bz2 | |
am 5ceec65d: am de3ff60d: am b7b92ae2: Merge "Fix build."
* commit '5ceec65d6482c472d6b55368d02f9f0d3992727c':
Fix build.
| -rw-r--r-- | libziparchive/zip_archive.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ static int32_t MapCentralDirectory0(int fd, const char* debug_file_name, 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; } |