diff options
| author | Elliott Hughes <enh@google.com> | 2019-06-13 22:26:27 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-13 22:26:27 +0200 |
| commit | e242d8743009c8b5f9cdb0249e5cc59da50d28f8 (patch) | |
| tree | 8bfd55be3a2888e112aae51c79c603385ac5d148 | |
| parent | Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544 (diff) | |
| parent | Merge "Use the new ziparchive Next std::string_view overload." (diff) | |
| download | android_bootable_recovery-e242d8743009c8b5f9cdb0249e5cc59da50d28f8.tar android_bootable_recovery-e242d8743009c8b5f9cdb0249e5cc59da50d28f8.tar.gz android_bootable_recovery-e242d8743009c8b5f9cdb0249e5cc59da50d28f8.tar.bz2 android_bootable_recovery-e242d8743009c8b5f9cdb0249e5cc59da50d28f8.tar.lz android_bootable_recovery-e242d8743009c8b5f9cdb0249e5cc59da50d28f8.tar.xz android_bootable_recovery-e242d8743009c8b5f9cdb0249e5cc59da50d28f8.tar.zst android_bootable_recovery-e242d8743009c8b5f9cdb0249e5cc59da50d28f8.zip | |
| -rw-r--r-- | install/install.cpp | 2 | ||||
| -rw-r--r-- | install/verifier.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/install/install.cpp b/install/install.cpp index 8d46641dc..445f3ab34 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -539,7 +539,7 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) { std::vector<std::string> compatibility_info; ZipEntry info_entry; - std::string info_name; + std::string_view 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]), diff --git a/install/verifier.cpp b/install/verifier.cpp index 02759cdc2..ab750442d 100644 --- a/install/verifier.cpp +++ b/install/verifier.cpp @@ -320,7 +320,7 @@ static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchi std::vector<Certificate> result; - std::string name; + std::string_view name; ZipEntry entry; while ((iter_status = Next(cookie, &entry, &name)) == 0) { std::vector<uint8_t> pem_content(entry.uncompressed_length); |