am 91080a42: am 2de01f5a: Merge "libziparchive: fix extraction of >2GiB images"

* commit '91080a4296da52eeb935410a25e79a78ebcc4c5b':
  libziparchive: fix extraction of >2GiB images
This commit is contained in:
Greg Hackmann 2015-03-23 21:49:43 +00:00 committed by Android Git Automerger
commit 7754367c4d

View file

@ -1123,7 +1123,7 @@ int32_t ExtractToMemory(ZipArchiveHandle handle,
int32_t ExtractEntryToFile(ZipArchiveHandle handle, int32_t ExtractEntryToFile(ZipArchiveHandle handle,
ZipEntry* entry, int fd) { ZipEntry* entry, int fd) {
const int32_t declared_length = entry->uncompressed_length; const uint32_t declared_length = entry->uncompressed_length;
const off64_t current_offset = lseek64(fd, 0, SEEK_CUR); const off64_t current_offset = lseek64(fd, 0, SEEK_CUR);
if (current_offset == -1) { if (current_offset == -1) {