summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Kutepov <its.kutepov@gmail.com>2018-01-13 22:33:40 +0300
committerAndreas Blaesius <skate4life@gmx.de>2018-01-14 13:03:07 +0100
commit6822ea3f2e4e733a38dc03892f6337f30bf75a29 (patch)
tree8555450017ba5b41c9f0b22e03b2fcf56ec803e7
parentabdb1748ddd420d03928d7d8ddbc13babc893a6d (diff)
downloadsystem_core-6822ea3f2e4e733a38dc03892f6337f30bf75a29.tar.gz
system_core-6822ea3f2e4e733a38dc03892f6337f30bf75a29.tar.bz2
system_core-6822ea3f2e4e733a38dc03892f6337f30bf75a29.zip
Fix wrong backport of commit 9dced16
* https://android.googlesource.com/platform/system/core/+/9dced1626219d47c75a9d37156ed7baeef8f6403 Change-Id: I393ae072f59548988eeae03afb7fd994545413e9
-rw-r--r--libziparchive/zip_archive.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index b93d192fe..75f3262ea 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -634,8 +634,8 @@ static int32_t ParseZipArchive(ZipArchive* archive) {
}
uint32_t lfh_start_bytes;
- if (!ReadAtOffset(archive->fd, reinterpret_cast<uint8_t*>(&lfh_start_bytes),
- sizeof(uint32_t), 0)) {
+ if (ReadAtOffset(archive->fd, reinterpret_cast<uint8_t*>(&lfh_start_bytes),
+ sizeof(uint32_t), 0) != sizeof(uint32_t)) {
ALOGW("Zip: Unable to read header for entry at offset == 0.");
return -1;
}