summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-05-23 22:10:12 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-05-23 22:10:12 +0200
commitee572560555b8749d991db6ce4499b50df3e611c (patch)
tree7e15749e8b28920108a87d5a378daf81f5a78951
parentMerge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd (diff)
parentMerge "Move off the Next ZipString overload." (diff)
downloadandroid_bootable_recovery-ee572560555b8749d991db6ce4499b50df3e611c.tar
android_bootable_recovery-ee572560555b8749d991db6ce4499b50df3e611c.tar.gz
android_bootable_recovery-ee572560555b8749d991db6ce4499b50df3e611c.tar.bz2
android_bootable_recovery-ee572560555b8749d991db6ce4499b50df3e611c.tar.lz
android_bootable_recovery-ee572560555b8749d991db6ce4499b50df3e611c.tar.xz
android_bootable_recovery-ee572560555b8749d991db6ce4499b50df3e611c.tar.zst
android_bootable_recovery-ee572560555b8749d991db6ce4499b50df3e611c.zip
-rw-r--r--applypatch/imgdiff.cpp5
-rw-r--r--install/install.cpp4
-rw-r--r--install/verifier.cpp7
3 files changed, 7 insertions, 9 deletions
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp
index cb34d4699..6ad4a6105 100644
--- a/applypatch/imgdiff.cpp
+++ b/applypatch/imgdiff.cpp
@@ -683,12 +683,11 @@ bool ZipModeImage::InitializeChunks(const std::string& filename, ZipArchiveHandl
// Create a list of deflated zip entries, sorted by offset.
std::vector<std::pair<std::string, ZipEntry>> temp_entries;
- ZipString name;
+ std::string name;
ZipEntry entry;
while ((ret = Next(cookie, &entry, &name)) == 0) {
if (entry.method == kCompressDeflated || limit_ > 0) {
- std::string entry_name(name.name, name.name + name.name_length);
- temp_entries.emplace_back(entry_name, entry);
+ temp_entries.emplace_back(name, entry);
}
}
diff --git a/install/install.cpp b/install/install.cpp
index 1b51b4246..8d46641dc 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -539,13 +539,13 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) {
std::vector<std::string> compatibility_info;
ZipEntry info_entry;
- ZipString info_name;
+ std::string info_name;
while (Next(cookie, &info_entry, &info_name) == 0) {
std::string content(info_entry.uncompressed_length, '\0');
int32_t ret = ExtractToMemory(zip_handle, &info_entry, reinterpret_cast<uint8_t*>(&content[0]),
info_entry.uncompressed_length);
if (ret != 0) {
- LOG(ERROR) << "Failed to read " << info_name.name << ": " << ErrorCodeString(ret);
+ LOG(ERROR) << "Failed to read " << info_name << ": " << ErrorCodeString(ret);
CloseArchive(zip_handle);
return false;
}
diff --git a/install/verifier.cpp b/install/verifier.cpp
index 3de58e4bb..02759cdc2 100644
--- a/install/verifier.cpp
+++ b/install/verifier.cpp
@@ -320,22 +320,21 @@ static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchi
std::vector<Certificate> result;
- ZipString name;
+ std::string name;
ZipEntry entry;
while ((iter_status = Next(cookie, &entry, &name)) == 0) {
std::vector<uint8_t> pem_content(entry.uncompressed_length);
if (int32_t extract_status =
ExtractToMemory(handle, &entry, pem_content.data(), pem_content.size());
extract_status != 0) {
- LOG(ERROR) << "Failed to extract " << std::string(name.name, name.name + name.name_length);
+ LOG(ERROR) << "Failed to extract " << name;
return {};
}
Certificate cert(0, Certificate::KEY_TYPE_RSA, nullptr, nullptr);
// Aborts the parsing if we fail to load one of the key file.
if (!LoadCertificateFromBuffer(pem_content, &cert)) {
- LOG(ERROR) << "Failed to load keys from "
- << std::string(name.name, name.name + name.name_length);
+ LOG(ERROR) << "Failed to load keys from " << name;
return {};
}