diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-06 10:44:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-06 10:44:04 +0000 |
| commit | 5ceec65d6482c472d6b55368d02f9f0d3992727c (patch) | |
| tree | 9e7cf7a8f43bbc12a6178b366ea9362c7cde85e3 | |
| parent | 35cafdfc4c21c062c5d223d795f639b3756853d8 (diff) | |
| parent | de3ff60d5a30c7a3d157ac95b2f7985aaae73a25 (diff) | |
| download | system_core-5ceec65d6482c472d6b55368d02f9f0d3992727c.zip system_core-5ceec65d6482c472d6b55368d02f9f0d3992727c.tar.gz system_core-5ceec65d6482c472d6b55368d02f9f0d3992727c.tar.bz2 | |
am de3ff60d: am b7b92ae2: Merge "Fix build."
* commit 'de3ff60d5a30c7a3d157ac95b2f7985aaae73a25':
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; } |