summaryrefslogtreecommitdiffstats
path: root/applypatch/imgdiff.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-05-23 03:52:29 +0200
committerElliott Hughes <enh@google.com>2019-05-23 03:52:29 +0200
commit88d8001e752573d8b87f7b0cbc784a18622abddd (patch)
treea7d815c4ea32e256958dee0b95026b7e18a6a755 /applypatch/imgdiff.cpp
parentMerge "recovery: report compliant reboot reason" (diff)
downloadandroid_bootable_recovery-88d8001e752573d8b87f7b0cbc784a18622abddd.tar
android_bootable_recovery-88d8001e752573d8b87f7b0cbc784a18622abddd.tar.gz
android_bootable_recovery-88d8001e752573d8b87f7b0cbc784a18622abddd.tar.bz2
android_bootable_recovery-88d8001e752573d8b87f7b0cbc784a18622abddd.tar.lz
android_bootable_recovery-88d8001e752573d8b87f7b0cbc784a18622abddd.tar.xz
android_bootable_recovery-88d8001e752573d8b87f7b0cbc784a18622abddd.tar.zst
android_bootable_recovery-88d8001e752573d8b87f7b0cbc784a18622abddd.zip
Diffstat (limited to '')
-rw-r--r--applypatch/imgdiff.cpp5
1 files changed, 2 insertions, 3 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);
}
}