2013-11-21 14:05:04 +01:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read-only access to Zip archives, with minimal heap allocation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
2014-03-14 22:26:22 +01:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <inttypes.h>
|
2013-11-21 14:05:04 +01:00
|
|
|
#include <limits.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
2015-04-09 23:11:18 +02:00
|
|
|
#include <memory>
|
|
|
|
#include <vector>
|
|
|
|
|
2015-04-27 17:25:53 +02:00
|
|
|
#include "base/file.h"
|
2015-04-09 23:11:18 +02:00
|
|
|
#include "base/macros.h" // TEMP_FAILURE_RETRY may or may not be in unistd
|
|
|
|
#include "base/memory.h"
|
|
|
|
#include "log/log.h"
|
|
|
|
#include "utils/Compat.h"
|
|
|
|
#include "utils/FileMap.h"
|
|
|
|
#include "zlib.h"
|
2013-11-21 14:05:04 +01:00
|
|
|
|
2014-12-03 19:22:53 +01:00
|
|
|
#include "entry_name_utils-inl.h"
|
2014-03-14 22:26:22 +01:00
|
|
|
#include "ziparchive/zip_archive.h"
|
|
|
|
|
2015-04-09 23:11:18 +02:00
|
|
|
using android::base::get_unaligned;
|
2014-12-03 19:22:53 +01:00
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
// This is for windows. If we don't open a file in binary mode, weird
|
2013-11-21 14:05:04 +01:00
|
|
|
// things will happen.
|
|
|
|
#ifndef O_BINARY
|
|
|
|
#define O_BINARY 0
|
|
|
|
#endif
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
// The "end of central directory" (EOCD) record. Each archive
|
|
|
|
// contains exactly once such record which appears at the end of
|
|
|
|
// the archive. It contains archive wide information like the
|
|
|
|
// number of entries in the archive and the offset to the central
|
|
|
|
// directory of the offset.
|
|
|
|
struct EocdRecord {
|
|
|
|
static const uint32_t kSignature = 0x06054b50;
|
|
|
|
|
|
|
|
// End of central directory signature, should always be
|
|
|
|
// |kSignature|.
|
|
|
|
uint32_t eocd_signature;
|
|
|
|
// The number of the current "disk", i.e, the "disk" that this
|
|
|
|
// central directory is on.
|
|
|
|
//
|
|
|
|
// This implementation assumes that each archive spans a single
|
|
|
|
// disk only. i.e, that disk_num == 1.
|
|
|
|
uint16_t disk_num;
|
|
|
|
// The disk where the central directory starts.
|
|
|
|
//
|
|
|
|
// This implementation assumes that each archive spans a single
|
|
|
|
// disk only. i.e, that cd_start_disk == 1.
|
|
|
|
uint16_t cd_start_disk;
|
|
|
|
// The number of central directory records on this disk.
|
|
|
|
//
|
|
|
|
// This implementation assumes that each archive spans a single
|
|
|
|
// disk only. i.e, that num_records_on_disk == num_records.
|
|
|
|
uint16_t num_records_on_disk;
|
|
|
|
// The total number of central directory records.
|
|
|
|
uint16_t num_records;
|
|
|
|
// The size of the central directory (in bytes).
|
|
|
|
uint32_t cd_size;
|
|
|
|
// The offset of the start of the central directory, relative
|
|
|
|
// to the start of the file.
|
|
|
|
uint32_t cd_start_offset;
|
|
|
|
// Length of the central directory comment.
|
|
|
|
uint16_t comment_length;
|
|
|
|
private:
|
2015-04-17 12:53:14 +02:00
|
|
|
EocdRecord() = default;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(EocdRecord);
|
2014-06-09 15:18:14 +02:00
|
|
|
} __attribute__((packed));
|
|
|
|
|
|
|
|
// A structure representing the fixed length fields for a single
|
|
|
|
// record in the central directory of the archive. In addition to
|
|
|
|
// the fixed length fields listed here, each central directory
|
|
|
|
// record contains a variable length "file_name" and "extra_field"
|
|
|
|
// whose lengths are given by |file_name_length| and |extra_field_length|
|
|
|
|
// respectively.
|
|
|
|
struct CentralDirectoryRecord {
|
|
|
|
static const uint32_t kSignature = 0x02014b50;
|
|
|
|
|
|
|
|
// The start of record signature. Must be |kSignature|.
|
|
|
|
uint32_t record_signature;
|
|
|
|
// Tool version. Ignored by this implementation.
|
|
|
|
uint16_t version_made_by;
|
|
|
|
// Tool version. Ignored by this implementation.
|
|
|
|
uint16_t version_needed;
|
|
|
|
// The "general purpose bit flags" for this entry. The only
|
|
|
|
// flag value that we currently check for is the "data descriptor"
|
|
|
|
// flag.
|
|
|
|
uint16_t gpb_flags;
|
|
|
|
// The compression method for this entry, one of |kCompressStored|
|
|
|
|
// and |kCompressDeflated|.
|
|
|
|
uint16_t compression_method;
|
|
|
|
// The file modification time and date for this entry.
|
|
|
|
uint16_t last_mod_time;
|
|
|
|
uint16_t last_mod_date;
|
|
|
|
// The CRC-32 checksum for this entry.
|
|
|
|
uint32_t crc32;
|
|
|
|
// The compressed size (in bytes) of this entry.
|
|
|
|
uint32_t compressed_size;
|
|
|
|
// The uncompressed size (in bytes) of this entry.
|
|
|
|
uint32_t uncompressed_size;
|
|
|
|
// The length of the entry file name in bytes. The file name
|
|
|
|
// will appear immediately after this record.
|
|
|
|
uint16_t file_name_length;
|
|
|
|
// The length of the extra field info (in bytes). This data
|
|
|
|
// will appear immediately after the entry file name.
|
|
|
|
uint16_t extra_field_length;
|
|
|
|
// The length of the entry comment (in bytes). This data will
|
|
|
|
// appear immediately after the extra field.
|
|
|
|
uint16_t comment_length;
|
|
|
|
// The start disk for this entry. Ignored by this implementation).
|
|
|
|
uint16_t file_start_disk;
|
|
|
|
// File attributes. Ignored by this implementation.
|
|
|
|
uint16_t internal_file_attributes;
|
|
|
|
// File attributes. Ignored by this implementation.
|
|
|
|
uint32_t external_file_attributes;
|
|
|
|
// The offset to the local file header for this entry, from the
|
|
|
|
// beginning of this archive.
|
|
|
|
uint32_t local_file_header_offset;
|
|
|
|
private:
|
2015-04-17 12:53:14 +02:00
|
|
|
CentralDirectoryRecord() = default;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(CentralDirectoryRecord);
|
2014-06-09 15:18:14 +02:00
|
|
|
} __attribute__((packed));
|
|
|
|
|
|
|
|
// The local file header for a given entry. This duplicates information
|
|
|
|
// present in the central directory of the archive. It is an error for
|
|
|
|
// the information here to be different from the central directory
|
|
|
|
// information for a given entry.
|
|
|
|
struct LocalFileHeader {
|
|
|
|
static const uint32_t kSignature = 0x04034b50;
|
|
|
|
|
|
|
|
// The local file header signature, must be |kSignature|.
|
|
|
|
uint32_t lfh_signature;
|
|
|
|
// Tool version. Ignored by this implementation.
|
|
|
|
uint16_t version_needed;
|
|
|
|
// The "general purpose bit flags" for this entry. The only
|
|
|
|
// flag value that we currently check for is the "data descriptor"
|
|
|
|
// flag.
|
|
|
|
uint16_t gpb_flags;
|
|
|
|
// The compression method for this entry, one of |kCompressStored|
|
|
|
|
// and |kCompressDeflated|.
|
|
|
|
uint16_t compression_method;
|
|
|
|
// The file modification time and date for this entry.
|
|
|
|
uint16_t last_mod_time;
|
|
|
|
uint16_t last_mod_date;
|
|
|
|
// The CRC-32 checksum for this entry.
|
|
|
|
uint32_t crc32;
|
|
|
|
// The compressed size (in bytes) of this entry.
|
|
|
|
uint32_t compressed_size;
|
|
|
|
// The uncompressed size (in bytes) of this entry.
|
|
|
|
uint32_t uncompressed_size;
|
|
|
|
// The length of the entry file name in bytes. The file name
|
|
|
|
// will appear immediately after this record.
|
|
|
|
uint16_t file_name_length;
|
|
|
|
// The length of the extra field info (in bytes). This data
|
|
|
|
// will appear immediately after the entry file name.
|
|
|
|
uint16_t extra_field_length;
|
|
|
|
private:
|
2015-04-17 12:53:14 +02:00
|
|
|
LocalFileHeader() = default;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(LocalFileHeader);
|
2014-06-09 15:18:14 +02:00
|
|
|
} __attribute__((packed));
|
|
|
|
|
|
|
|
struct DataDescriptor {
|
|
|
|
// The *optional* data descriptor start signature.
|
|
|
|
static const uint32_t kOptSignature = 0x08074b50;
|
|
|
|
|
|
|
|
// CRC-32 checksum of the entry.
|
|
|
|
uint32_t crc32;
|
|
|
|
// Compressed size of the entry.
|
|
|
|
uint32_t compressed_size;
|
|
|
|
// Uncompressed size of the entry.
|
|
|
|
uint32_t uncompressed_size;
|
|
|
|
private:
|
2015-04-17 12:53:14 +02:00
|
|
|
DataDescriptor() = default;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(DataDescriptor);
|
2014-06-09 15:18:14 +02:00
|
|
|
} __attribute__((packed));
|
|
|
|
|
|
|
|
|
2014-08-13 11:49:25 +02:00
|
|
|
static const uint32_t kGPBDDFlagMask = 0x0008; // mask value that signifies that the entry has a DD
|
2013-11-21 14:05:04 +01:00
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
// The maximum size of a central directory or a file
|
|
|
|
// comment in bytes.
|
|
|
|
static const uint32_t kMaxCommentLen = 65535;
|
|
|
|
|
|
|
|
// The maximum number of bytes to scan backwards for the EOCD start.
|
|
|
|
static const uint32_t kMaxEOCDSearch = kMaxCommentLen + sizeof(EocdRecord);
|
|
|
|
|
2013-11-21 14:05:04 +01:00
|
|
|
static const char* kErrorMessages[] = {
|
|
|
|
"Unknown return code.",
|
2013-12-09 17:26:36 +01:00
|
|
|
"Iteration ended",
|
2013-11-21 14:05:04 +01:00
|
|
|
"Zlib error",
|
|
|
|
"Invalid file",
|
|
|
|
"Invalid handle",
|
|
|
|
"Duplicate entries in archive",
|
|
|
|
"Empty archive",
|
|
|
|
"Entry not found",
|
|
|
|
"Invalid offset",
|
|
|
|
"Inconsistent information",
|
|
|
|
"Invalid entry name",
|
2013-12-09 17:26:36 +01:00
|
|
|
"I/O Error",
|
2013-12-11 15:51:51 +01:00
|
|
|
"File mapping failed"
|
2013-11-21 14:05:04 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
static const int32_t kErrorMessageUpperBound = 0;
|
|
|
|
|
2013-12-09 17:26:36 +01:00
|
|
|
static const int32_t kIterationEnd = -1;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
// We encountered a Zlib error when inflating a stream from this file.
|
|
|
|
// Usually indicates file corruption.
|
|
|
|
static const int32_t kZlibError = -2;
|
|
|
|
|
|
|
|
// The input file cannot be processed as a zip archive. Usually because
|
|
|
|
// it's too small, too large or does not have a valid signature.
|
|
|
|
static const int32_t kInvalidFile = -3;
|
|
|
|
|
|
|
|
// An invalid iteration / ziparchive handle was passed in as an input
|
|
|
|
// argument.
|
|
|
|
static const int32_t kInvalidHandle = -4;
|
|
|
|
|
|
|
|
// The zip archive contained two (or possibly more) entries with the same
|
|
|
|
// name.
|
|
|
|
static const int32_t kDuplicateEntry = -5;
|
|
|
|
|
|
|
|
// The zip archive contains no entries.
|
|
|
|
static const int32_t kEmptyArchive = -6;
|
|
|
|
|
|
|
|
// The specified entry was not found in the archive.
|
|
|
|
static const int32_t kEntryNotFound = -7;
|
|
|
|
|
|
|
|
// The zip archive contained an invalid local file header pointer.
|
|
|
|
static const int32_t kInvalidOffset = -8;
|
|
|
|
|
|
|
|
// The zip archive contained inconsistent entry information. This could
|
|
|
|
// be because the central directory & local file header did not agree, or
|
|
|
|
// if the actual uncompressed length or crc32 do not match their declared
|
|
|
|
// values.
|
|
|
|
static const int32_t kInconsistentInformation = -9;
|
|
|
|
|
|
|
|
// An invalid entry name was encountered.
|
|
|
|
static const int32_t kInvalidEntryName = -10;
|
|
|
|
|
2013-12-09 17:26:36 +01:00
|
|
|
// An I/O related system call (read, lseek, ftruncate, map) failed.
|
|
|
|
static const int32_t kIoError = -11;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
2013-12-11 15:51:51 +01:00
|
|
|
// We were not able to mmap the central directory or entry contents.
|
|
|
|
static const int32_t kMmapFailed = -12;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
2013-12-11 15:51:51 +01:00
|
|
|
static const int32_t kErrorMessageLowerBound = -13;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* A Read-only Zip archive.
|
|
|
|
*
|
|
|
|
* We want "open" and "find entry by name" to be fast operations, and
|
|
|
|
* we want to use as little memory as possible. We memory-map the zip
|
|
|
|
* central directory, and load a hash table with pointers to the filenames
|
|
|
|
* (which aren't null-terminated). The other fields are at a fixed offset
|
|
|
|
* from the filename, so we don't need to extract those (but we do need
|
|
|
|
* to byte-read and endian-swap them every time we want them).
|
|
|
|
*
|
|
|
|
* It's possible that somebody has handed us a massive (~1GB) zip archive,
|
|
|
|
* so we can't expect to mmap the entire file.
|
|
|
|
*
|
|
|
|
* To speed comparisons when doing a lookup by name, we could make the mapping
|
|
|
|
* "private" (copy-on-write) and null-terminate the filenames after verifying
|
|
|
|
* the record structure. However, this requires a private mapping of
|
|
|
|
* every page that the Central Directory touches. Easier to tuck a copy
|
|
|
|
* of the string length into the hash table entry.
|
|
|
|
*/
|
|
|
|
struct ZipArchive {
|
|
|
|
/* open Zip archive */
|
2014-07-25 15:43:04 +02:00
|
|
|
const int fd;
|
2014-07-16 04:33:00 +02:00
|
|
|
const bool close_file;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
/* mapped central directory area */
|
|
|
|
off64_t directory_offset;
|
2015-03-06 19:22:34 +01:00
|
|
|
android::FileMap directory_map;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
/* number of entries in the Zip archive */
|
|
|
|
uint16_t num_entries;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We know how many entries are in the Zip archive, so we can have a
|
|
|
|
* fixed-size hash table. We define a load factor of 0.75 and overallocat
|
|
|
|
* so the maximum number entries can never be higher than
|
|
|
|
* ((4 * UINT16_MAX) / 3 + 1) which can safely fit into a uint32_t.
|
|
|
|
*/
|
|
|
|
uint32_t hash_table_size;
|
2015-06-25 23:39:19 +02:00
|
|
|
ZipString* hash_table;
|
2014-07-25 15:43:04 +02:00
|
|
|
|
2014-07-16 04:33:00 +02:00
|
|
|
ZipArchive(const int fd, bool assume_ownership) :
|
2014-07-25 15:43:04 +02:00
|
|
|
fd(fd),
|
2014-07-16 04:33:00 +02:00
|
|
|
close_file(assume_ownership),
|
2014-07-25 15:43:04 +02:00
|
|
|
directory_offset(0),
|
|
|
|
num_entries(0),
|
|
|
|
hash_table_size(0),
|
|
|
|
hash_table(NULL) {}
|
|
|
|
|
|
|
|
~ZipArchive() {
|
2014-07-16 04:33:00 +02:00
|
|
|
if (close_file && fd >= 0) {
|
2014-07-25 15:43:04 +02:00
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(hash_table);
|
|
|
|
}
|
2013-11-21 14:05:04 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Round up to the next highest power of 2.
|
|
|
|
*
|
|
|
|
* Found on http://graphics.stanford.edu/~seander/bithacks.html.
|
|
|
|
*/
|
|
|
|
static uint32_t RoundUpPower2(uint32_t val) {
|
|
|
|
val--;
|
|
|
|
val |= val >> 1;
|
|
|
|
val |= val >> 2;
|
|
|
|
val |= val >> 4;
|
|
|
|
val |= val >> 8;
|
|
|
|
val |= val >> 16;
|
|
|
|
val++;
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2015-06-25 23:39:19 +02:00
|
|
|
static uint32_t ComputeHash(const ZipString& name) {
|
2013-11-21 14:05:04 +01:00
|
|
|
uint32_t hash = 0;
|
2014-08-11 17:35:11 +02:00
|
|
|
uint16_t len = name.name_length;
|
|
|
|
const uint8_t* str = name.name;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
while (len--) {
|
|
|
|
hash = hash * 31 + *str++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Convert a ZipEntry to a hash table index, verifying that it's in a
|
|
|
|
* valid range.
|
|
|
|
*/
|
2015-06-25 23:39:19 +02:00
|
|
|
static int64_t EntryToIndex(const ZipString* hash_table,
|
2013-11-21 14:05:04 +01:00
|
|
|
const uint32_t hash_table_size,
|
2015-06-25 23:39:19 +02:00
|
|
|
const ZipString& name) {
|
2014-08-11 17:35:11 +02:00
|
|
|
const uint32_t hash = ComputeHash(name);
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
// NOTE: (hash_table_size - 1) is guaranteed to be non-negative.
|
|
|
|
uint32_t ent = hash & (hash_table_size - 1);
|
|
|
|
while (hash_table[ent].name != NULL) {
|
2015-06-25 23:39:19 +02:00
|
|
|
if (hash_table[ent] == name) {
|
2013-11-21 14:05:04 +01:00
|
|
|
return ent;
|
|
|
|
}
|
|
|
|
|
|
|
|
ent = (ent + 1) & (hash_table_size - 1);
|
|
|
|
}
|
|
|
|
|
2014-08-11 17:35:11 +02:00
|
|
|
ALOGV("Zip: Unable to find entry %.*s", name.name_length, name.name);
|
2013-11-21 14:05:04 +01:00
|
|
|
return kEntryNotFound;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add a new entry to the hash table.
|
|
|
|
*/
|
2015-06-25 23:39:19 +02:00
|
|
|
static int32_t AddToHash(ZipString *hash_table, const uint64_t hash_table_size,
|
|
|
|
const ZipString& name) {
|
2014-08-11 17:35:11 +02:00
|
|
|
const uint64_t hash = ComputeHash(name);
|
2013-11-21 14:05:04 +01:00
|
|
|
uint32_t ent = hash & (hash_table_size - 1);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We over-allocated the table, so we're guaranteed to find an empty slot.
|
|
|
|
* Further, we guarantee that the hashtable size is not 0.
|
|
|
|
*/
|
|
|
|
while (hash_table[ent].name != NULL) {
|
2015-06-25 23:39:19 +02:00
|
|
|
if (hash_table[ent] == name) {
|
2013-11-21 14:05:04 +01:00
|
|
|
// We've found a duplicate entry. We don't accept it
|
2014-08-11 17:35:11 +02:00
|
|
|
ALOGW("Zip: Found duplicate entry %.*s", name.name_length, name.name);
|
2013-11-21 14:05:04 +01:00
|
|
|
return kDuplicateEntry;
|
|
|
|
}
|
|
|
|
ent = (ent + 1) & (hash_table_size - 1);
|
|
|
|
}
|
|
|
|
|
2014-08-11 17:35:11 +02:00
|
|
|
hash_table[ent].name = name.name;
|
|
|
|
hash_table[ent].name_length = name.name_length;
|
2013-11-21 14:05:04 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int32_t MapCentralDirectory0(int fd, const char* debug_file_name,
|
|
|
|
ZipArchive* archive, off64_t file_length,
|
2014-06-09 15:18:14 +02:00
|
|
|
off64_t read_amount, uint8_t* scan_buffer) {
|
2013-11-21 14:05:04 +01:00
|
|
|
const off64_t search_start = file_length - read_amount;
|
|
|
|
|
|
|
|
if (lseek64(fd, search_start, SEEK_SET) != search_start) {
|
2014-06-09 15:18:14 +02:00
|
|
|
ALOGW("Zip: seek %" PRId64 " failed: %s", static_cast<int64_t>(search_start),
|
|
|
|
strerror(errno));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kIoError;
|
|
|
|
}
|
2014-06-09 15:18:14 +02:00
|
|
|
ssize_t actual = TEMP_FAILURE_RETRY(
|
|
|
|
read(fd, scan_buffer, static_cast<size_t>(read_amount)));
|
|
|
|
if (actual != static_cast<ssize_t>(read_amount)) {
|
|
|
|
ALOGW("Zip: read %" PRId64 " failed: %s", static_cast<int64_t>(read_amount),
|
|
|
|
strerror(errno));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kIoError;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Scan backward for the EOCD magic. In an archive without a trailing
|
|
|
|
* comment, we'll find it on the first try. (We may want to consider
|
|
|
|
* doing an initial minimal read; if we don't find it, retry with a
|
|
|
|
* second read as above.)
|
|
|
|
*/
|
2014-06-09 15:18:14 +02:00
|
|
|
int i = read_amount - sizeof(EocdRecord);
|
|
|
|
for (; i >= 0; i--) {
|
2015-04-09 23:11:18 +02:00
|
|
|
if (scan_buffer[i] == 0x50) {
|
|
|
|
uint32_t* sig_addr = reinterpret_cast<uint32_t*>(&scan_buffer[i]);
|
|
|
|
if (get_unaligned<uint32_t>(sig_addr) == EocdRecord::kSignature) {
|
|
|
|
ALOGV("+++ Found EOCD at buf+%d", i);
|
|
|
|
break;
|
|
|
|
}
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i < 0) {
|
|
|
|
ALOGD("Zip: EOCD not found, %s is not zip", debug_file_name);
|
|
|
|
return kInvalidFile;
|
|
|
|
}
|
|
|
|
|
|
|
|
const off64_t eocd_offset = search_start + i;
|
2014-06-09 15:18:14 +02:00
|
|
|
const EocdRecord* eocd = reinterpret_cast<const EocdRecord*>(scan_buffer + i);
|
2013-11-21 14:05:04 +01:00
|
|
|
/*
|
2014-06-09 15:18:14 +02:00
|
|
|
* Verify that there's no trailing space at the end of the central directory
|
|
|
|
* and its comment.
|
2013-11-21 14:05:04 +01:00
|
|
|
*/
|
2014-06-09 15:18:14 +02:00
|
|
|
const off64_t calculated_length = eocd_offset + sizeof(EocdRecord)
|
|
|
|
+ eocd->comment_length;
|
|
|
|
if (calculated_length != file_length) {
|
2014-06-03 14:59:23 +02:00
|
|
|
ALOGW("Zip: %" PRId64 " extraneous bytes at the end of the central directory",
|
2014-06-09 15:18:14 +02:00
|
|
|
static_cast<int64_t>(file_length - calculated_length));
|
2014-06-03 14:59:23 +02:00
|
|
|
return kInvalidFile;
|
|
|
|
}
|
2013-11-21 14:05:04 +01:00
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
/*
|
|
|
|
* Grab the CD offset and size, and the number of entries in the
|
|
|
|
* archive and verify that they look reasonable.
|
|
|
|
*/
|
|
|
|
if (eocd->cd_start_offset + eocd->cd_size > eocd_offset) {
|
|
|
|
ALOGW("Zip: bad offsets (dir %" PRIu32 ", size %" PRIu32 ", eocd %" PRId64 ")",
|
|
|
|
eocd->cd_start_offset, eocd->cd_size, static_cast<int64_t>(eocd_offset));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInvalidOffset;
|
|
|
|
}
|
2014-06-09 15:18:14 +02:00
|
|
|
if (eocd->num_records == 0) {
|
2013-11-21 14:05:04 +01:00
|
|
|
ALOGW("Zip: empty archive?");
|
|
|
|
return kEmptyArchive;
|
|
|
|
}
|
|
|
|
|
2015-06-05 00:21:59 +02:00
|
|
|
ALOGV("+++ num_entries=%" PRIu32 " dir_size=%" PRIu32 " dir_offset=%" PRIu32,
|
2014-06-09 15:18:14 +02:00
|
|
|
eocd->num_records, eocd->cd_size, eocd->cd_start_offset);
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* It all looks good. Create a mapping for the CD, and set the fields
|
|
|
|
* in archive.
|
|
|
|
*/
|
2015-03-06 19:22:34 +01:00
|
|
|
if (!archive->directory_map.create(debug_file_name, fd,
|
|
|
|
static_cast<off64_t>(eocd->cd_start_offset),
|
|
|
|
static_cast<size_t>(eocd->cd_size), true /* read only */) ) {
|
2013-12-11 15:51:51 +01:00
|
|
|
return kMmapFailed;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
archive->num_entries = eocd->num_records;
|
|
|
|
archive->directory_offset = eocd->cd_start_offset;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find the zip Central Directory and memory-map it.
|
|
|
|
*
|
|
|
|
* On success, returns 0 after populating fields from the EOCD area:
|
|
|
|
* directory_offset
|
|
|
|
* directory_map
|
|
|
|
* num_entries
|
|
|
|
*/
|
|
|
|
static int32_t MapCentralDirectory(int fd, const char* debug_file_name,
|
|
|
|
ZipArchive* archive) {
|
|
|
|
|
|
|
|
// Test file length. We use lseek64 to make sure the file
|
|
|
|
// is small enough to be a zip file (Its size must be less than
|
|
|
|
// 0xffffffff bytes).
|
|
|
|
off64_t file_length = lseek64(fd, 0, SEEK_END);
|
|
|
|
if (file_length == -1) {
|
|
|
|
ALOGV("Zip: lseek on fd %d failed", fd);
|
|
|
|
return kInvalidFile;
|
|
|
|
}
|
|
|
|
|
2015-03-06 19:50:56 +01:00
|
|
|
if (file_length > static_cast<off64_t>(0xffffffff)) {
|
2014-06-09 15:18:14 +02:00
|
|
|
ALOGV("Zip: zip file too long %" PRId64, static_cast<int64_t>(file_length));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInvalidFile;
|
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
if (file_length < static_cast<off64_t>(sizeof(EocdRecord))) {
|
|
|
|
ALOGV("Zip: length %" PRId64 " is too small to be zip", static_cast<int64_t>(file_length));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInvalidFile;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Perform the traditional EOCD snipe hunt.
|
|
|
|
*
|
|
|
|
* We're searching for the End of Central Directory magic number,
|
|
|
|
* which appears at the start of the EOCD block. It's followed by
|
|
|
|
* 18 bytes of EOCD stuff and up to 64KB of archive comment. We
|
|
|
|
* need to read the last part of the file into a buffer, dig through
|
|
|
|
* it to find the magic number, parse some values out, and use those
|
|
|
|
* to determine the extent of the CD.
|
|
|
|
*
|
|
|
|
* We start by pulling in the last part of the file.
|
|
|
|
*/
|
2014-06-09 15:18:14 +02:00
|
|
|
off64_t read_amount = kMaxEOCDSearch;
|
|
|
|
if (file_length < read_amount) {
|
2013-11-21 14:05:04 +01:00
|
|
|
read_amount = file_length;
|
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
uint8_t* scan_buffer = reinterpret_cast<uint8_t*>(malloc(read_amount));
|
2013-11-21 14:05:04 +01:00
|
|
|
int32_t result = MapCentralDirectory0(fd, debug_file_name, archive,
|
|
|
|
file_length, read_amount, scan_buffer);
|
|
|
|
|
|
|
|
free(scan_buffer);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parses the Zip archive's Central Directory. Allocates and populates the
|
|
|
|
* hash table.
|
|
|
|
*
|
|
|
|
* Returns 0 on success.
|
|
|
|
*/
|
|
|
|
static int32_t ParseZipArchive(ZipArchive* archive) {
|
2015-03-06 19:50:56 +01:00
|
|
|
const uint8_t* const cd_ptr =
|
|
|
|
reinterpret_cast<const uint8_t*>(archive->directory_map.getDataPtr());
|
2015-03-06 19:22:34 +01:00
|
|
|
const size_t cd_length = archive->directory_map.getDataLength();
|
2014-06-09 15:18:14 +02:00
|
|
|
const uint16_t num_entries = archive->num_entries;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Create hash table. We have a minimum 75% load factor, possibly as
|
|
|
|
* low as 50% after we round off to a power of 2. There must be at
|
|
|
|
* least one unused entry to avoid an infinite loop during creation.
|
|
|
|
*/
|
|
|
|
archive->hash_table_size = RoundUpPower2(1 + (num_entries * 4) / 3);
|
2015-06-25 23:39:19 +02:00
|
|
|
archive->hash_table = reinterpret_cast<ZipString*>(calloc(archive->hash_table_size,
|
|
|
|
sizeof(ZipString)));
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Walk through the central directory, adding entries to the hash
|
|
|
|
* table and verifying values.
|
|
|
|
*/
|
2014-06-09 15:18:14 +02:00
|
|
|
const uint8_t* const cd_end = cd_ptr + cd_length;
|
2013-11-21 14:05:04 +01:00
|
|
|
const uint8_t* ptr = cd_ptr;
|
|
|
|
for (uint16_t i = 0; i < num_entries; i++) {
|
2014-06-09 15:18:14 +02:00
|
|
|
const CentralDirectoryRecord* cdr =
|
|
|
|
reinterpret_cast<const CentralDirectoryRecord*>(ptr);
|
|
|
|
if (cdr->record_signature != CentralDirectoryRecord::kSignature) {
|
2014-05-09 01:02:20 +02:00
|
|
|
ALOGW("Zip: missed a central dir sig (at %" PRIu16 ")", i);
|
2015-03-06 20:48:47 +01:00
|
|
|
return -1;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
if (ptr + sizeof(CentralDirectoryRecord) > cd_end) {
|
2014-05-09 01:02:20 +02:00
|
|
|
ALOGW("Zip: ran off the end (at %" PRIu16 ")", i);
|
2015-03-06 20:48:47 +01:00
|
|
|
return -1;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
const off64_t local_header_offset = cdr->local_file_header_offset;
|
2013-11-21 14:05:04 +01:00
|
|
|
if (local_header_offset >= archive->directory_offset) {
|
2015-03-06 19:50:56 +01:00
|
|
|
ALOGW("Zip: bad LFH offset %" PRId64 " at entry %" PRIu16,
|
|
|
|
static_cast<int64_t>(local_header_offset), i);
|
2015-03-06 20:48:47 +01:00
|
|
|
return -1;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
const uint16_t file_name_length = cdr->file_name_length;
|
|
|
|
const uint16_t extra_length = cdr->extra_field_length;
|
|
|
|
const uint16_t comment_length = cdr->comment_length;
|
2014-08-15 13:53:00 +02:00
|
|
|
const uint8_t* file_name = ptr + sizeof(CentralDirectoryRecord);
|
|
|
|
|
2014-12-03 19:22:53 +01:00
|
|
|
/* check that file name is valid UTF-8 and doesn't contain NUL (U+0000) characters */
|
|
|
|
if (!IsValidEntryName(file_name, file_name_length)) {
|
2015-03-06 20:48:47 +01:00
|
|
|
return -1;
|
2014-08-15 13:53:00 +02:00
|
|
|
}
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
/* add the CDE filename to the hash table */
|
2015-06-25 23:39:19 +02:00
|
|
|
ZipString entry_name;
|
2014-08-11 17:35:11 +02:00
|
|
|
entry_name.name = file_name;
|
|
|
|
entry_name.name_length = file_name_length;
|
2013-11-21 14:05:04 +01:00
|
|
|
const int add_result = AddToHash(archive->hash_table,
|
2014-08-11 17:35:11 +02:00
|
|
|
archive->hash_table_size, entry_name);
|
2015-03-06 20:48:47 +01:00
|
|
|
if (add_result != 0) {
|
2013-11-21 14:05:04 +01:00
|
|
|
ALOGW("Zip: Error adding entry to hash table %d", add_result);
|
2015-03-06 20:48:47 +01:00
|
|
|
return add_result;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
ptr += sizeof(CentralDirectoryRecord) + file_name_length + extra_length + comment_length;
|
|
|
|
if ((ptr - cd_ptr) > static_cast<int64_t>(cd_length)) {
|
2014-05-09 01:02:20 +02:00
|
|
|
ALOGW("Zip: bad CD advance (%tu vs %zu) at entry %" PRIu16,
|
|
|
|
ptr - cd_ptr, cd_length, i);
|
2015-03-06 20:48:47 +01:00
|
|
|
return -1;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
}
|
2014-05-09 01:02:20 +02:00
|
|
|
ALOGV("+++ zip good scan %" PRIu16 " entries", num_entries);
|
2013-11-21 14:05:04 +01:00
|
|
|
|
2015-03-06 20:48:47 +01:00
|
|
|
return 0;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int32_t OpenArchiveInternal(ZipArchive* archive,
|
|
|
|
const char* debug_file_name) {
|
|
|
|
int32_t result = -1;
|
|
|
|
if ((result = MapCentralDirectory(archive->fd, debug_file_name, archive))) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((result = ParseZipArchive(archive))) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int32_t OpenArchiveFd(int fd, const char* debug_file_name,
|
2014-07-16 04:33:00 +02:00
|
|
|
ZipArchiveHandle* handle, bool assume_ownership) {
|
|
|
|
ZipArchive* archive = new ZipArchive(fd, assume_ownership);
|
2013-11-21 14:05:04 +01:00
|
|
|
*handle = archive;
|
|
|
|
return OpenArchiveInternal(archive, debug_file_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
int32_t OpenArchive(const char* fileName, ZipArchiveHandle* handle) {
|
2014-07-25 15:43:04 +02:00
|
|
|
const int fd = open(fileName, O_RDONLY | O_BINARY, 0);
|
2014-07-16 04:33:00 +02:00
|
|
|
ZipArchive* archive = new ZipArchive(fd, true);
|
2013-11-21 14:05:04 +01:00
|
|
|
*handle = archive;
|
|
|
|
|
|
|
|
if (fd < 0) {
|
|
|
|
ALOGW("Unable to open '%s': %s", fileName, strerror(errno));
|
|
|
|
return kIoError;
|
|
|
|
}
|
2014-07-16 04:33:00 +02:00
|
|
|
|
2013-11-21 14:05:04 +01:00
|
|
|
return OpenArchiveInternal(archive, fileName);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Close a ZipArchive, closing the file and freeing the contents.
|
|
|
|
*/
|
|
|
|
void CloseArchive(ZipArchiveHandle handle) {
|
2015-03-06 19:50:56 +01:00
|
|
|
ZipArchive* archive = reinterpret_cast<ZipArchive*>(handle);
|
2013-11-21 14:05:04 +01:00
|
|
|
ALOGV("Closing archive %p", archive);
|
2014-07-25 15:43:04 +02:00
|
|
|
delete archive;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int32_t UpdateEntryFromDataDescriptor(int fd,
|
|
|
|
ZipEntry *entry) {
|
2014-06-09 15:18:14 +02:00
|
|
|
uint8_t ddBuf[sizeof(DataDescriptor) + sizeof(DataDescriptor::kOptSignature)];
|
2013-11-21 14:05:04 +01:00
|
|
|
ssize_t actual = TEMP_FAILURE_RETRY(read(fd, ddBuf, sizeof(ddBuf)));
|
|
|
|
if (actual != sizeof(ddBuf)) {
|
|
|
|
return kIoError;
|
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
const uint32_t ddSignature = *(reinterpret_cast<const uint32_t*>(ddBuf));
|
|
|
|
const uint16_t offset = (ddSignature == DataDescriptor::kOptSignature) ? 4 : 0;
|
|
|
|
const DataDescriptor* descriptor = reinterpret_cast<const DataDescriptor*>(ddBuf + offset);
|
2013-11-21 14:05:04 +01:00
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
entry->crc32 = descriptor->crc32;
|
|
|
|
entry->compressed_length = descriptor->compressed_size;
|
|
|
|
entry->uncompressed_length = descriptor->uncompressed_size;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Attempts to read |len| bytes into |buf| at offset |off|.
|
|
|
|
//
|
|
|
|
// This method uses pread64 on platforms that support it and
|
|
|
|
// lseek64 + read on platforms that don't. This implies that
|
|
|
|
// callers should not rely on the |fd| offset being incremented
|
|
|
|
// as a side effect of this call.
|
|
|
|
static inline ssize_t ReadAtOffset(int fd, uint8_t* buf, size_t len,
|
|
|
|
off64_t off) {
|
2014-11-20 05:47:18 +01:00
|
|
|
#if !defined(_WIN32)
|
2013-11-21 14:05:04 +01:00
|
|
|
return TEMP_FAILURE_RETRY(pread64(fd, buf, len, off));
|
|
|
|
#else
|
|
|
|
// The only supported platform that doesn't support pread at the moment
|
|
|
|
// is Windows. Only recent versions of windows support unix like forks,
|
|
|
|
// and even there the semantics are quite different.
|
|
|
|
if (lseek64(fd, off, SEEK_SET) != off) {
|
2014-03-14 22:26:22 +01:00
|
|
|
ALOGW("Zip: failed seek to offset %" PRId64, off);
|
2013-11-21 14:05:04 +01:00
|
|
|
return kIoError;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TEMP_FAILURE_RETRY(read(fd, buf, len));
|
2014-11-20 05:47:18 +01:00
|
|
|
#endif
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int32_t FindEntry(const ZipArchive* archive, const int ent,
|
|
|
|
ZipEntry* data) {
|
|
|
|
const uint16_t nameLen = archive->hash_table[ent].name_length;
|
|
|
|
|
|
|
|
// Recover the start of the central directory entry from the filename
|
|
|
|
// pointer. The filename is the first entry past the fixed-size data,
|
|
|
|
// so we can just subtract back from that.
|
2014-08-11 17:35:11 +02:00
|
|
|
const uint8_t* ptr = archive->hash_table[ent].name;
|
2014-06-09 15:18:14 +02:00
|
|
|
ptr -= sizeof(CentralDirectoryRecord);
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
// This is the base of our mmapped region, we have to sanity check that
|
|
|
|
// the name that's in the hash table is a pointer to a location within
|
|
|
|
// this mapped region.
|
2014-06-09 15:18:14 +02:00
|
|
|
const uint8_t* base_ptr = reinterpret_cast<const uint8_t*>(
|
2015-03-06 19:22:34 +01:00
|
|
|
archive->directory_map.getDataPtr());
|
|
|
|
if (ptr < base_ptr || ptr > base_ptr + archive->directory_map.getDataLength()) {
|
2013-11-21 14:05:04 +01:00
|
|
|
ALOGW("Zip: Invalid entry pointer");
|
|
|
|
return kInvalidOffset;
|
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
const CentralDirectoryRecord *cdr =
|
|
|
|
reinterpret_cast<const CentralDirectoryRecord*>(ptr);
|
|
|
|
|
2013-11-21 14:05:04 +01:00
|
|
|
// The offset of the start of the central directory in the zipfile.
|
|
|
|
// We keep this lying around so that we can sanity check all our lengths
|
|
|
|
// and our per-file structures.
|
|
|
|
const off64_t cd_offset = archive->directory_offset;
|
|
|
|
|
|
|
|
// Fill out the compression method, modification time, crc32
|
|
|
|
// and other interesting attributes from the central directory. These
|
|
|
|
// will later be compared against values from the local file header.
|
2014-06-09 15:18:14 +02:00
|
|
|
data->method = cdr->compression_method;
|
|
|
|
data->mod_time = cdr->last_mod_time;
|
|
|
|
data->crc32 = cdr->crc32;
|
|
|
|
data->compressed_length = cdr->compressed_size;
|
|
|
|
data->uncompressed_length = cdr->uncompressed_size;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
// Figure out the local header offset from the central directory. The
|
|
|
|
// actual file data will begin after the local header and the name /
|
|
|
|
// extra comments.
|
2014-06-09 15:18:14 +02:00
|
|
|
const off64_t local_header_offset = cdr->local_file_header_offset;
|
|
|
|
if (local_header_offset + static_cast<off64_t>(sizeof(LocalFileHeader)) >= cd_offset) {
|
2013-11-21 14:05:04 +01:00
|
|
|
ALOGW("Zip: bad local hdr offset in zip");
|
|
|
|
return kInvalidOffset;
|
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
uint8_t lfh_buf[sizeof(LocalFileHeader)];
|
2013-11-21 14:05:04 +01:00
|
|
|
ssize_t actual = ReadAtOffset(archive->fd, lfh_buf, sizeof(lfh_buf),
|
|
|
|
local_header_offset);
|
|
|
|
if (actual != sizeof(lfh_buf)) {
|
2015-03-06 19:50:56 +01:00
|
|
|
ALOGW("Zip: failed reading lfh name from offset %" PRId64,
|
|
|
|
static_cast<int64_t>(local_header_offset));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kIoError;
|
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
const LocalFileHeader *lfh = reinterpret_cast<const LocalFileHeader*>(lfh_buf);
|
|
|
|
|
|
|
|
if (lfh->lfh_signature != LocalFileHeader::kSignature) {
|
2014-03-14 22:26:22 +01:00
|
|
|
ALOGW("Zip: didn't find signature at start of lfh, offset=%" PRId64,
|
2014-06-09 15:18:14 +02:00
|
|
|
static_cast<int64_t>(local_header_offset));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInvalidOffset;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Paranoia: Match the values specified in the local file header
|
|
|
|
// to those specified in the central directory.
|
2014-06-09 15:18:14 +02:00
|
|
|
if ((lfh->gpb_flags & kGPBDDFlagMask) == 0) {
|
2013-11-21 14:05:04 +01:00
|
|
|
data->has_data_descriptor = 0;
|
2014-06-09 15:18:14 +02:00
|
|
|
if (data->compressed_length != lfh->compressed_size
|
|
|
|
|| data->uncompressed_length != lfh->uncompressed_size
|
|
|
|
|| data->crc32 != lfh->crc32) {
|
2014-05-09 01:02:20 +02:00
|
|
|
ALOGW("Zip: size/crc32 mismatch. expected {%" PRIu32 ", %" PRIu32
|
|
|
|
", %" PRIx32 "}, was {%" PRIu32 ", %" PRIu32 ", %" PRIx32 "}",
|
2013-11-21 14:05:04 +01:00
|
|
|
data->compressed_length, data->uncompressed_length, data->crc32,
|
2014-06-09 15:18:14 +02:00
|
|
|
lfh->compressed_size, lfh->uncompressed_size, lfh->crc32);
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInconsistentInformation;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
data->has_data_descriptor = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that the local file header name matches the declared
|
|
|
|
// name in the central directory.
|
2014-06-09 15:18:14 +02:00
|
|
|
if (lfh->file_name_length == nameLen) {
|
|
|
|
const off64_t name_offset = local_header_offset + sizeof(LocalFileHeader);
|
2014-09-08 12:46:37 +02:00
|
|
|
if (name_offset + lfh->file_name_length > cd_offset) {
|
2013-11-21 14:05:04 +01:00
|
|
|
ALOGW("Zip: Invalid declared length");
|
|
|
|
return kInvalidOffset;
|
|
|
|
}
|
|
|
|
|
2015-03-06 19:50:56 +01:00
|
|
|
uint8_t* name_buf = reinterpret_cast<uint8_t*>(malloc(nameLen));
|
2013-11-21 14:05:04 +01:00
|
|
|
ssize_t actual = ReadAtOffset(archive->fd, name_buf, nameLen,
|
|
|
|
name_offset);
|
|
|
|
|
|
|
|
if (actual != nameLen) {
|
2015-03-06 19:50:56 +01:00
|
|
|
ALOGW("Zip: failed reading lfh name from offset %" PRId64, static_cast<int64_t>(name_offset));
|
2013-11-21 14:05:04 +01:00
|
|
|
free(name_buf);
|
|
|
|
return kIoError;
|
|
|
|
}
|
|
|
|
|
2014-08-11 17:35:11 +02:00
|
|
|
if (memcmp(archive->hash_table[ent].name, name_buf, nameLen)) {
|
2013-11-21 14:05:04 +01:00
|
|
|
free(name_buf);
|
|
|
|
return kInconsistentInformation;
|
|
|
|
}
|
|
|
|
|
|
|
|
free(name_buf);
|
|
|
|
} else {
|
|
|
|
ALOGW("Zip: lfh name did not match central directory.");
|
|
|
|
return kInconsistentInformation;
|
|
|
|
}
|
|
|
|
|
2014-06-09 15:18:14 +02:00
|
|
|
const off64_t data_offset = local_header_offset + sizeof(LocalFileHeader)
|
|
|
|
+ lfh->file_name_length + lfh->extra_field_length;
|
2014-01-24 13:32:39 +01:00
|
|
|
if (data_offset > cd_offset) {
|
2015-03-06 19:50:56 +01:00
|
|
|
ALOGW("Zip: bad data offset %" PRId64 " in zip", static_cast<int64_t>(data_offset));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInvalidOffset;
|
|
|
|
}
|
|
|
|
|
2015-03-06 19:50:56 +01:00
|
|
|
if (static_cast<off64_t>(data_offset + data->compressed_length) > cd_offset) {
|
2014-05-09 01:02:20 +02:00
|
|
|
ALOGW("Zip: bad compressed length in zip (%" PRId64 " + %" PRIu32 " > %" PRId64 ")",
|
2015-03-06 19:50:56 +01:00
|
|
|
static_cast<int64_t>(data_offset), data->compressed_length, static_cast<int64_t>(cd_offset));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInvalidOffset;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->method == kCompressStored &&
|
2015-03-06 19:50:56 +01:00
|
|
|
static_cast<off64_t>(data_offset + data->uncompressed_length) > cd_offset) {
|
2014-05-09 01:02:20 +02:00
|
|
|
ALOGW("Zip: bad uncompressed length in zip (%" PRId64 " + %" PRIu32 " > %" PRId64 ")",
|
2015-03-06 19:50:56 +01:00
|
|
|
static_cast<int64_t>(data_offset), data->uncompressed_length,
|
|
|
|
static_cast<int64_t>(cd_offset));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInvalidOffset;
|
|
|
|
}
|
|
|
|
|
|
|
|
data->offset = data_offset;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct IterationHandle {
|
|
|
|
uint32_t position;
|
2014-08-19 10:01:20 +02:00
|
|
|
// We're not using vector here because this code is used in the Windows SDK
|
|
|
|
// where the STL is not available.
|
2015-06-25 23:39:19 +02:00
|
|
|
ZipString prefix;
|
|
|
|
ZipString suffix;
|
2013-11-21 14:05:04 +01:00
|
|
|
ZipArchive* archive;
|
2014-08-18 12:37:45 +02:00
|
|
|
|
2015-06-25 23:39:19 +02:00
|
|
|
IterationHandle(const ZipString* in_prefix,
|
|
|
|
const ZipString* in_suffix) {
|
|
|
|
if (in_prefix) {
|
|
|
|
uint8_t* name_copy = new uint8_t[in_prefix->name_length];
|
|
|
|
memcpy(name_copy, in_prefix->name, in_prefix->name_length);
|
|
|
|
prefix.name = name_copy;
|
|
|
|
prefix.name_length = in_prefix->name_length;
|
|
|
|
} else {
|
|
|
|
prefix.name = NULL;
|
|
|
|
prefix.name_length = 0;
|
2015-06-25 23:09:00 +02:00
|
|
|
}
|
2015-06-25 23:39:19 +02:00
|
|
|
if (in_suffix) {
|
|
|
|
uint8_t* name_copy = new uint8_t[in_suffix->name_length];
|
|
|
|
memcpy(name_copy, in_suffix->name, in_suffix->name_length);
|
|
|
|
suffix.name = name_copy;
|
|
|
|
suffix.name_length = in_suffix->name_length;
|
|
|
|
} else {
|
|
|
|
suffix.name = NULL;
|
|
|
|
suffix.name_length = 0;
|
2015-06-25 23:09:00 +02:00
|
|
|
}
|
2014-08-18 12:37:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
~IterationHandle() {
|
2015-06-25 23:39:19 +02:00
|
|
|
delete[] prefix.name;
|
|
|
|
delete[] suffix.name;
|
2014-08-18 12:37:45 +02:00
|
|
|
}
|
2013-11-21 14:05:04 +01:00
|
|
|
};
|
|
|
|
|
2014-08-11 17:35:11 +02:00
|
|
|
int32_t StartIteration(ZipArchiveHandle handle, void** cookie_ptr,
|
2015-06-25 23:39:19 +02:00
|
|
|
const ZipString* optional_prefix,
|
|
|
|
const ZipString* optional_suffix) {
|
2015-03-06 19:50:56 +01:00
|
|
|
ZipArchive* archive = reinterpret_cast<ZipArchive*>(handle);
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
if (archive == NULL || archive->hash_table == NULL) {
|
|
|
|
ALOGW("Zip: Invalid ZipArchiveHandle");
|
|
|
|
return kInvalidHandle;
|
|
|
|
}
|
|
|
|
|
2015-06-25 23:09:00 +02:00
|
|
|
IterationHandle* cookie = new IterationHandle(optional_prefix, optional_suffix);
|
2013-11-21 14:05:04 +01:00
|
|
|
cookie->position = 0;
|
|
|
|
cookie->archive = archive;
|
|
|
|
|
|
|
|
*cookie_ptr = cookie ;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-08-08 15:02:17 +02:00
|
|
|
void EndIteration(void* cookie) {
|
2014-08-11 17:35:11 +02:00
|
|
|
delete reinterpret_cast<IterationHandle*>(cookie);
|
2014-08-08 15:02:17 +02:00
|
|
|
}
|
|
|
|
|
2015-06-25 23:39:19 +02:00
|
|
|
int32_t FindEntry(const ZipArchiveHandle handle, const ZipString& entryName,
|
2013-11-21 14:05:04 +01:00
|
|
|
ZipEntry* data) {
|
2015-03-06 19:50:56 +01:00
|
|
|
const ZipArchive* archive = reinterpret_cast<ZipArchive*>(handle);
|
2014-08-11 17:35:11 +02:00
|
|
|
if (entryName.name_length == 0) {
|
|
|
|
ALOGW("Zip: Invalid filename %.*s", entryName.name_length, entryName.name);
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInvalidEntryName;
|
|
|
|
}
|
|
|
|
|
|
|
|
const int64_t ent = EntryToIndex(archive->hash_table,
|
2014-08-11 17:35:11 +02:00
|
|
|
archive->hash_table_size, entryName);
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
if (ent < 0) {
|
2014-08-11 17:35:11 +02:00
|
|
|
ALOGV("Zip: Could not find entry %.*s", entryName.name_length, entryName.name);
|
2013-11-21 14:05:04 +01:00
|
|
|
return ent;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FindEntry(archive, ent, data);
|
|
|
|
}
|
|
|
|
|
2015-06-25 23:39:19 +02:00
|
|
|
int32_t Next(void* cookie, ZipEntry* data, ZipString* name) {
|
2015-03-06 19:50:56 +01:00
|
|
|
IterationHandle* handle = reinterpret_cast<IterationHandle*>(cookie);
|
2013-11-21 14:05:04 +01:00
|
|
|
if (handle == NULL) {
|
|
|
|
return kInvalidHandle;
|
|
|
|
}
|
|
|
|
|
|
|
|
ZipArchive* archive = handle->archive;
|
|
|
|
if (archive == NULL || archive->hash_table == NULL) {
|
|
|
|
ALOGW("Zip: Invalid ZipArchiveHandle");
|
|
|
|
return kInvalidHandle;
|
|
|
|
}
|
|
|
|
|
|
|
|
const uint32_t currentOffset = handle->position;
|
|
|
|
const uint32_t hash_table_length = archive->hash_table_size;
|
2015-06-25 23:39:19 +02:00
|
|
|
const ZipString* hash_table = archive->hash_table;
|
2013-11-21 14:05:04 +01:00
|
|
|
|
|
|
|
for (uint32_t i = currentOffset; i < hash_table_length; ++i) {
|
|
|
|
if (hash_table[i].name != NULL &&
|
2015-06-25 23:39:19 +02:00
|
|
|
(handle->prefix.name_length == 0 ||
|
|
|
|
hash_table[i].StartsWith(handle->prefix)) &&
|
|
|
|
(handle->suffix.name_length == 0 ||
|
|
|
|
hash_table[i].EndsWith(handle->suffix))) {
|
2013-11-21 14:05:04 +01:00
|
|
|
handle->position = (i + 1);
|
|
|
|
const int error = FindEntry(archive, i, data);
|
|
|
|
if (!error) {
|
|
|
|
name->name = hash_table[i].name;
|
|
|
|
name->name_length = hash_table[i].name_length;
|
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
handle->position = 0;
|
|
|
|
return kIterationEnd;
|
|
|
|
}
|
|
|
|
|
2015-04-17 12:53:14 +02:00
|
|
|
class Writer {
|
|
|
|
public:
|
|
|
|
virtual bool Append(uint8_t* buf, size_t buf_size) = 0;
|
|
|
|
virtual ~Writer() {}
|
|
|
|
protected:
|
|
|
|
Writer() = default;
|
|
|
|
private:
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(Writer);
|
|
|
|
};
|
|
|
|
|
|
|
|
// A Writer that writes data to a fixed size memory region.
|
|
|
|
// The size of the memory region must be equal to the total size of
|
|
|
|
// the data appended to it.
|
|
|
|
class MemoryWriter : public Writer {
|
|
|
|
public:
|
|
|
|
MemoryWriter(uint8_t* buf, size_t size) : Writer(),
|
|
|
|
buf_(buf), size_(size), bytes_written_(0) {
|
|
|
|
}
|
|
|
|
|
|
|
|
virtual bool Append(uint8_t* buf, size_t buf_size) override {
|
|
|
|
if (bytes_written_ + buf_size > size_) {
|
|
|
|
ALOGW("Zip: Unexpected size " ZD " (declared) vs " ZD " (actual)",
|
|
|
|
size_, bytes_written_ + buf_size);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(buf_ + bytes_written_, buf, buf_size);
|
|
|
|
bytes_written_ += buf_size;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
uint8_t* const buf_;
|
|
|
|
const size_t size_;
|
|
|
|
size_t bytes_written_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// A Writer that appends data to a file |fd| at its current position.
|
|
|
|
// The file will be truncated to the end of the written data.
|
|
|
|
class FileWriter : public Writer {
|
|
|
|
public:
|
|
|
|
|
|
|
|
// Creates a FileWriter for |fd| and prepare to write |entry| to it,
|
|
|
|
// guaranteeing that the file descriptor is valid and that there's enough
|
|
|
|
// space on the volume to write out the entry completely and that the file
|
|
|
|
// is truncated to the correct length.
|
|
|
|
//
|
|
|
|
// Returns a valid FileWriter on success, |nullptr| if an error occurred.
|
|
|
|
static std::unique_ptr<FileWriter> Create(int fd, const ZipEntry* entry) {
|
|
|
|
const uint32_t declared_length = entry->uncompressed_length;
|
|
|
|
const off64_t current_offset = lseek64(fd, 0, SEEK_CUR);
|
|
|
|
if (current_offset == -1) {
|
|
|
|
ALOGW("Zip: unable to seek to current location on fd %d: %s", fd, strerror(errno));
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
int result = 0;
|
|
|
|
#if defined(__linux__)
|
|
|
|
if (declared_length > 0) {
|
|
|
|
// Make sure we have enough space on the volume to extract the compressed
|
|
|
|
// entry. Note that the call to ftruncate below will change the file size but
|
|
|
|
// will not allocate space on disk and this call to fallocate will not
|
|
|
|
// change the file size.
|
2015-06-02 23:47:57 +02:00
|
|
|
// Note: fallocate is only supported by the following filesystems -
|
|
|
|
// btrfs, ext4, ocfs2, and xfs. Therefore fallocate might fail with
|
|
|
|
// EOPNOTSUPP error when issued in other filesystems.
|
|
|
|
// Hence, check for the return error code before concluding that the
|
|
|
|
// disk does not have enough space.
|
2015-04-17 12:53:14 +02:00
|
|
|
result = TEMP_FAILURE_RETRY(fallocate(fd, 0, current_offset, declared_length));
|
2015-06-02 23:47:57 +02:00
|
|
|
if (result == -1 && errno == ENOSPC) {
|
2015-04-17 12:53:14 +02:00
|
|
|
ALOGW("Zip: unable to allocate space for file to %" PRId64 ": %s",
|
|
|
|
static_cast<int64_t>(declared_length + current_offset), strerror(errno));
|
|
|
|
return std::unique_ptr<FileWriter>(nullptr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif // __linux__
|
|
|
|
|
|
|
|
result = TEMP_FAILURE_RETRY(ftruncate(fd, declared_length + current_offset));
|
|
|
|
if (result == -1) {
|
|
|
|
ALOGW("Zip: unable to truncate file to %" PRId64 ": %s",
|
|
|
|
static_cast<int64_t>(declared_length + current_offset), strerror(errno));
|
|
|
|
return std::unique_ptr<FileWriter>(nullptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return std::unique_ptr<FileWriter>(new FileWriter(fd, declared_length));
|
|
|
|
}
|
|
|
|
|
|
|
|
virtual bool Append(uint8_t* buf, size_t buf_size) override {
|
|
|
|
if (total_bytes_written_ + buf_size > declared_length_) {
|
|
|
|
ALOGW("Zip: Unexpected size " ZD " (declared) vs " ZD " (actual)",
|
|
|
|
declared_length_, total_bytes_written_ + buf_size);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2015-04-27 17:25:53 +02:00
|
|
|
const bool result = android::base::WriteFully(fd_, buf, buf_size);
|
|
|
|
if (result) {
|
|
|
|
total_bytes_written_ += buf_size;
|
|
|
|
} else {
|
|
|
|
ALOGW("Zip: unable to write " ZD " bytes to file; %s", buf_size, strerror(errno));
|
2015-04-17 12:53:14 +02:00
|
|
|
}
|
|
|
|
|
2015-04-27 17:25:53 +02:00
|
|
|
return result;
|
2015-04-17 12:53:14 +02:00
|
|
|
}
|
|
|
|
private:
|
|
|
|
FileWriter(const int fd, const size_t declared_length) :
|
|
|
|
Writer(),
|
|
|
|
fd_(fd),
|
|
|
|
declared_length_(declared_length),
|
|
|
|
total_bytes_written_(0) {
|
|
|
|
}
|
|
|
|
|
|
|
|
const int fd_;
|
|
|
|
const size_t declared_length_;
|
|
|
|
size_t total_bytes_written_;
|
|
|
|
};
|
|
|
|
|
2015-03-06 22:27:59 +01:00
|
|
|
// This method is using libz macros with old-style-casts
|
|
|
|
#pragma GCC diagnostic push
|
|
|
|
#pragma GCC diagnostic ignored "-Wold-style-cast"
|
|
|
|
static inline int zlib_inflateInit2(z_stream* stream, int window_bits) {
|
|
|
|
return inflateInit2(stream, window_bits);
|
|
|
|
}
|
|
|
|
#pragma GCC diagnostic pop
|
|
|
|
|
2015-04-17 12:53:14 +02:00
|
|
|
static int32_t InflateEntryToWriter(int fd, const ZipEntry* entry,
|
|
|
|
Writer* writer, uint64_t* crc_out) {
|
2015-03-12 17:58:15 +01:00
|
|
|
const size_t kBufSize = 32768;
|
|
|
|
std::vector<uint8_t> read_buf(kBufSize);
|
|
|
|
std::vector<uint8_t> write_buf(kBufSize);
|
2013-11-21 14:05:04 +01:00
|
|
|
z_stream zstream;
|
|
|
|
int zerr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize the zlib stream struct.
|
|
|
|
*/
|
|
|
|
memset(&zstream, 0, sizeof(zstream));
|
|
|
|
zstream.zalloc = Z_NULL;
|
|
|
|
zstream.zfree = Z_NULL;
|
|
|
|
zstream.opaque = Z_NULL;
|
|
|
|
zstream.next_in = NULL;
|
|
|
|
zstream.avail_in = 0;
|
2015-03-12 17:58:15 +01:00
|
|
|
zstream.next_out = &write_buf[0];
|
2013-11-21 14:05:04 +01:00
|
|
|
zstream.avail_out = kBufSize;
|
|
|
|
zstream.data_type = Z_UNKNOWN;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Use the undocumented "negative window bits" feature to tell zlib
|
|
|
|
* that there's no zlib header waiting for it.
|
|
|
|
*/
|
2015-03-06 22:27:59 +01:00
|
|
|
zerr = zlib_inflateInit2(&zstream, -MAX_WBITS);
|
2013-11-21 14:05:04 +01:00
|
|
|
if (zerr != Z_OK) {
|
|
|
|
if (zerr == Z_VERSION_ERROR) {
|
|
|
|
ALOGE("Installed zlib is not compatible with linked version (%s)",
|
|
|
|
ZLIB_VERSION);
|
|
|
|
} else {
|
|
|
|
ALOGW("Call to inflateInit2 failed (zerr=%d)", zerr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return kZlibError;
|
|
|
|
}
|
|
|
|
|
2015-03-06 23:26:37 +01:00
|
|
|
auto zstream_deleter = [](z_stream* stream) {
|
|
|
|
inflateEnd(stream); /* free up any allocated structures */
|
|
|
|
};
|
|
|
|
|
|
|
|
std::unique_ptr<z_stream, decltype(zstream_deleter)> zstream_guard(&zstream, zstream_deleter);
|
|
|
|
|
2013-11-21 14:05:04 +01:00
|
|
|
const uint32_t uncompressed_length = entry->uncompressed_length;
|
|
|
|
|
|
|
|
uint32_t compressed_length = entry->compressed_length;
|
|
|
|
do {
|
|
|
|
/* read as much as we can */
|
|
|
|
if (zstream.avail_in == 0) {
|
2014-05-05 23:38:05 +02:00
|
|
|
const ZD_TYPE getSize = (compressed_length > kBufSize) ? kBufSize : compressed_length;
|
2015-03-12 17:58:15 +01:00
|
|
|
const ZD_TYPE actual = TEMP_FAILURE_RETRY(read(fd, &read_buf[0], getSize));
|
2013-11-21 14:05:04 +01:00
|
|
|
if (actual != getSize) {
|
2014-05-05 23:38:05 +02:00
|
|
|
ALOGW("Zip: inflate read failed (" ZD " vs " ZD ")", actual, getSize);
|
2015-03-06 23:26:37 +01:00
|
|
|
return kIoError;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
compressed_length -= getSize;
|
|
|
|
|
2015-03-12 17:58:15 +01:00
|
|
|
zstream.next_in = &read_buf[0];
|
2013-11-21 14:05:04 +01:00
|
|
|
zstream.avail_in = getSize;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* uncompress the data */
|
|
|
|
zerr = inflate(&zstream, Z_NO_FLUSH);
|
|
|
|
if (zerr != Z_OK && zerr != Z_STREAM_END) {
|
|
|
|
ALOGW("Zip: inflate zerr=%d (nIn=%p aIn=%u nOut=%p aOut=%u)",
|
|
|
|
zerr, zstream.next_in, zstream.avail_in,
|
|
|
|
zstream.next_out, zstream.avail_out);
|
2015-03-06 23:26:37 +01:00
|
|
|
return kZlibError;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* write when we're full or when we're done */
|
|
|
|
if (zstream.avail_out == 0 ||
|
|
|
|
(zerr == Z_STREAM_END && zstream.avail_out != kBufSize)) {
|
2015-03-12 17:58:15 +01:00
|
|
|
const size_t write_size = zstream.next_out - &write_buf[0];
|
2015-04-17 12:53:14 +02:00
|
|
|
if (!writer->Append(&write_buf[0], write_size)) {
|
|
|
|
// The file might have declared a bogus length.
|
|
|
|
return kInconsistentInformation;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
2015-03-12 17:58:15 +01:00
|
|
|
zstream.next_out = &write_buf[0];
|
2013-11-21 14:05:04 +01:00
|
|
|
zstream.avail_out = kBufSize;
|
|
|
|
}
|
|
|
|
} while (zerr == Z_OK);
|
|
|
|
|
|
|
|
assert(zerr == Z_STREAM_END); /* other errors should've been caught */
|
|
|
|
|
|
|
|
// stream.adler holds the crc32 value for such streams.
|
|
|
|
*crc_out = zstream.adler;
|
|
|
|
|
|
|
|
if (zstream.total_out != uncompressed_length || compressed_length != 0) {
|
2014-05-09 01:02:20 +02:00
|
|
|
ALOGW("Zip: size mismatch on inflated file (%lu vs %" PRIu32 ")",
|
2013-11-21 14:05:04 +01:00
|
|
|
zstream.total_out, uncompressed_length);
|
2015-03-06 23:26:37 +01:00
|
|
|
return kInconsistentInformation;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
2015-03-06 23:26:37 +01:00
|
|
|
return 0;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
2015-04-17 12:53:14 +02:00
|
|
|
static int32_t CopyEntryToWriter(int fd, const ZipEntry* entry, Writer* writer,
|
|
|
|
uint64_t *crc_out) {
|
|
|
|
static const uint32_t kBufSize = 32768;
|
|
|
|
std::vector<uint8_t> buf(kBufSize);
|
|
|
|
|
|
|
|
const uint32_t length = entry->uncompressed_length;
|
|
|
|
uint32_t count = 0;
|
|
|
|
uint64_t crc = 0;
|
|
|
|
while (count < length) {
|
|
|
|
uint32_t remaining = length - count;
|
|
|
|
|
|
|
|
// Safe conversion because kBufSize is narrow enough for a 32 bit signed
|
|
|
|
// value.
|
|
|
|
const ssize_t block_size = (remaining > kBufSize) ? kBufSize : remaining;
|
|
|
|
const ssize_t actual = TEMP_FAILURE_RETRY(read(fd, &buf[0], block_size));
|
|
|
|
|
|
|
|
if (actual != block_size) {
|
|
|
|
ALOGW("CopyFileToFile: copy read failed (" ZD " vs " ZD ")", actual, block_size);
|
|
|
|
return kIoError;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!writer->Append(&buf[0], block_size)) {
|
|
|
|
return kIoError;
|
|
|
|
}
|
|
|
|
crc = crc32(crc, &buf[0], block_size);
|
|
|
|
count += block_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
*crc_out = crc;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int32_t ExtractToWriter(ZipArchiveHandle handle,
|
|
|
|
ZipEntry* entry, Writer* writer) {
|
2015-03-06 19:50:56 +01:00
|
|
|
ZipArchive* archive = reinterpret_cast<ZipArchive*>(handle);
|
2013-11-21 14:05:04 +01:00
|
|
|
const uint16_t method = entry->method;
|
|
|
|
off64_t data_offset = entry->offset;
|
|
|
|
|
|
|
|
if (lseek64(archive->fd, data_offset, SEEK_SET) != data_offset) {
|
2015-03-06 19:50:56 +01:00
|
|
|
ALOGW("Zip: lseek to data at %" PRId64 " failed", static_cast<int64_t>(data_offset));
|
2013-11-21 14:05:04 +01:00
|
|
|
return kIoError;
|
|
|
|
}
|
|
|
|
|
|
|
|
// this should default to kUnknownCompressionMethod.
|
|
|
|
int32_t return_value = -1;
|
|
|
|
uint64_t crc = 0;
|
|
|
|
if (method == kCompressStored) {
|
2015-04-17 12:53:14 +02:00
|
|
|
return_value = CopyEntryToWriter(archive->fd, entry, writer, &crc);
|
2013-11-21 14:05:04 +01:00
|
|
|
} else if (method == kCompressDeflated) {
|
2015-04-17 12:53:14 +02:00
|
|
|
return_value = InflateEntryToWriter(archive->fd, entry, writer, &crc);
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!return_value && entry->has_data_descriptor) {
|
|
|
|
return_value = UpdateEntryFromDataDescriptor(archive->fd, entry);
|
|
|
|
if (return_value) {
|
|
|
|
return return_value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: Fix this check by passing the right flags to inflate2 so that
|
|
|
|
// it calculates the CRC for us.
|
|
|
|
if (entry->crc32 != crc && false) {
|
2014-05-09 01:02:20 +02:00
|
|
|
ALOGW("Zip: crc mismatch: expected %" PRIu32 ", was %" PRIu64, entry->crc32, crc);
|
2013-11-21 14:05:04 +01:00
|
|
|
return kInconsistentInformation;
|
|
|
|
}
|
|
|
|
|
|
|
|
return return_value;
|
|
|
|
}
|
|
|
|
|
2015-04-17 12:53:14 +02:00
|
|
|
int32_t ExtractToMemory(ZipArchiveHandle handle, ZipEntry* entry,
|
|
|
|
uint8_t* begin, uint32_t size) {
|
|
|
|
std::unique_ptr<Writer> writer(new MemoryWriter(begin, size));
|
|
|
|
return ExtractToWriter(handle, entry, writer.get());
|
|
|
|
}
|
|
|
|
|
2013-11-21 14:05:04 +01:00
|
|
|
int32_t ExtractEntryToFile(ZipArchiveHandle handle,
|
|
|
|
ZipEntry* entry, int fd) {
|
2015-04-17 12:53:14 +02:00
|
|
|
std::unique_ptr<Writer> writer(FileWriter::Create(fd, entry));
|
|
|
|
if (writer.get() == nullptr) {
|
2013-12-13 17:06:19 +01:00
|
|
|
return kIoError;
|
|
|
|
}
|
|
|
|
|
2015-04-17 12:53:14 +02:00
|
|
|
return ExtractToWriter(handle, entry, writer.get());
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
const char* ErrorCodeString(int32_t error_code) {
|
|
|
|
if (error_code > kErrorMessageLowerBound && error_code < kErrorMessageUpperBound) {
|
|
|
|
return kErrorMessages[error_code * -1];
|
|
|
|
}
|
|
|
|
|
|
|
|
return kErrorMessages[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
int GetFileDescriptor(const ZipArchiveHandle handle) {
|
2015-03-06 19:50:56 +01:00
|
|
|
return reinterpret_cast<ZipArchive*>(handle)->fd;
|
2013-11-21 14:05:04 +01:00
|
|
|
}
|