ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am de3ff60d: am b7b92ae2: Merge "Fix build."

Browse source 
* commit 'de3ff60d5a30c7a3d157ac95b2f7985aaae73a25':
  Fix build.
This commit is contained in:
Narayan Kamath 2014-06-06 10:44:04 +00:00 • committed by Android Git Automerger
commit 5ceec65d64
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libziparchive/zip_archive.cc
View file

@ -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 off64_t dir_offset = get4LE(eocd_ptr + kEOCDFileOffset);
const uint16_t comment_length = get2LE(eocd_ptr + kEOCDCommentLen); 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", 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; return kInvalidFile;
} }