diff options
| author | Elliott Hughes <enh@google.com> | 2019-05-23 20:23:36 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-23 20:23:36 +0200 |
| commit | 505ed459409c180386e2b09fcb9f79bd14ec4b5a (patch) | |
| tree | b191a6b41229ce9867842fc60e5bd9dae1e96f54 /applypatch/imgdiff.cpp | |
| parent | Merge "Revert "recovery: report compliant reboot reason"" (diff) | |
| parent | Merge "Move off the Next ZipString overload." (diff) | |
| download | android_bootable_recovery-505ed459409c180386e2b09fcb9f79bd14ec4b5a.tar android_bootable_recovery-505ed459409c180386e2b09fcb9f79bd14ec4b5a.tar.gz android_bootable_recovery-505ed459409c180386e2b09fcb9f79bd14ec4b5a.tar.bz2 android_bootable_recovery-505ed459409c180386e2b09fcb9f79bd14ec4b5a.tar.lz android_bootable_recovery-505ed459409c180386e2b09fcb9f79bd14ec4b5a.tar.xz android_bootable_recovery-505ed459409c180386e2b09fcb9f79bd14ec4b5a.tar.zst android_bootable_recovery-505ed459409c180386e2b09fcb9f79bd14ec4b5a.zip | |
Diffstat (limited to 'applypatch/imgdiff.cpp')
| -rw-r--r-- | applypatch/imgdiff.cpp | 5 |
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); } } |