commit 52a977ca56891ea21f335e80ea3eee2976490a96
author Greg Hackmann <ghackmann@google.com> Mon Mar 23 21:49:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 23 21:49:43 2015 +0000
tree 77576864c391e28d37d667bc22d140ee6c831602
parent a8f766cf3f39056a35ecacbba9248e91446166e8
parent fdd5d9e884f3e40a655b47a4dfcf060ab0df1c22

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

* commit '91080a4296da52eeb935410a25e79a78ebcc4c5b':
  libziparchive: fix extraction of >2GiB images

libziparchive/zip_archive.cc

diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index 6475649..58285f1 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -1123,7 +1123,7 @@
 
 int32_t ExtractEntryToFile(ZipArchiveHandle handle,
                            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);
   if (current_offset == -1) {