diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-06 11:19:56 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-06-06 10:20:37 +0000 |
| commit | c00de56063deaa3c27ab0f1778730e3f14e9a952 (patch) | |
| tree | 2deb054c473022560e0606824eab949696249b30 /libziparchive | |
| parent | a8c89ee35a87de29afc0e828f0b22b537d2cc410 (diff) | |
| download | system_core-c00de56063deaa3c27ab0f1778730e3f14e9a952.zip system_core-c00de56063deaa3c27ab0f1778730e3f14e9a952.tar.gz system_core-c00de56063deaa3c27ab0f1778730e3f14e9a952.tar.bz2 | |
Fix build.
Uncommitted changes from a rename.
Change-Id: If1cac7104c436970f905eede683040ae79529292
Diffstat (limited to 'libziparchive')
| -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; } |