diff options
| author | Greg Hackmann | 2015-03-23 16:42:14 -0500 |
|---|---|---|
| committer | Gerrit Code Review | 2015-03-23 16:42:15 -0500 |
| commit | 2de01f5a99f916c36124c6bc8cb0d6f18df03496 (patch) | |
| tree | d9b7f7924908ab289a2298cfe2f11403110c0fe3 | |
| parent | 9f8093f88850304fd225ae612c3df960d1d247fc (diff) | |
| parent | 503cd6d4375d4f47c2cd5a83d3c8a651aeed521c (diff) | |
| download | platform-system-core-2de01f5a99f916c36124c6bc8cb0d6f18df03496.tar.gz platform-system-core-2de01f5a99f916c36124c6bc8cb0d6f18df03496.tar.xz platform-system-core-2de01f5a99f916c36124c6bc8cb0d6f18df03496.zip | |
Merge "libziparchive: fix extraction of >2GiB images"
| -rw-r--r-- | libziparchive/zip_archive.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc index 6475649d5..58285f130 100644 --- a/libziparchive/zip_archive.cc +++ b/libziparchive/zip_archive.cc | |||
| @@ -1123,7 +1123,7 @@ int32_t ExtractToMemory(ZipArchiveHandle handle, | |||
| 1123 | 1123 | ||
| 1124 | int32_t ExtractEntryToFile(ZipArchiveHandle handle, | 1124 | int32_t ExtractEntryToFile(ZipArchiveHandle handle, |
| 1125 | ZipEntry* entry, int fd) { | 1125 | ZipEntry* entry, int fd) { |
| 1126 | const int32_t declared_length = entry->uncompressed_length; | 1126 | const uint32_t declared_length = entry->uncompressed_length; |
| 1127 | 1127 | ||
| 1128 | const off64_t current_offset = lseek64(fd, 0, SEEK_CUR); | 1128 | const off64_t current_offset = lseek64(fd, 0, SEEK_CUR); |
| 1129 | if (current_offset == -1) { | 1129 | if (current_offset == -1) { |