diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-02 19:30:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 19:30:42 +0000 |
| commit | 30b8cc3ef7d75b0b65b633c9c56d6df542646f70 (patch) | |
| tree | 37693881ae7dc619293ce72e031cd08129a617cc | |
| parent | 33715240012d9738c22f3d2305082dff37fa217a (diff) | |
| parent | 58b810332748d8c2590837aadc9c993eeff5a872 (diff) | |
| download | zlib-30b8cc3ef7d75b0b65b633c9c56d6df542646f70.tar.gz | |
Merge "Upgrade zlib to 09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e" am: 9d1908c2c5 am: ae82ee6917 am: 58b8103327
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1662840
Change-Id: I4acd813262b54c36ebef85052c120464434b595a
| -rw-r--r-- | METADATA | 6 | ||||
| -rw-r--r-- | google/zip_reader.cc | 14 |
2 files changed, 10 insertions, 10 deletions
@@ -5,11 +5,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/chromium/src/third_party/zlib/" } - version: "bf44340d1b6be1af8950bbdf664fec0cf5a831cc" + version: "09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e" license_type: NOTICE last_upgrade_date { year: 2021 - month: 2 - day: 5 + month: 4 + day: 1 } } diff --git a/google/zip_reader.cc b/google/zip_reader.cc index 96e9ff0..1910cf2 100644 --- a/google/zip_reader.cc +++ b/google/zip_reader.cc @@ -101,7 +101,7 @@ ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip, is_unsafe_ = file_path_.ReferencesParent(); // We also consider that the file name is unsafe, if it's invalid UTF-8. - base::string16 file_name_utf16; + std::u16string file_name_utf16; if (!base::UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(), &file_name_utf16)) { is_unsafe_ = true; @@ -334,9 +334,9 @@ void ZipReader::ExtractCurrentEntryToFilePathAsync( base::SequencedTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(), - Passed(std::move(output_file)), - std::move(success_callback), std::move(failure_callback), - progress_callback, 0 /* initial offset */)); + std::move(output_file), std::move(success_callback), + std::move(failure_callback), progress_callback, + 0 /* initial offset */)); } bool ZipReader::ExtractCurrentEntryToString(uint64_t max_read_bytes, @@ -436,9 +436,9 @@ void ZipReader::ExtractChunk(base::File output_file, base::SequencedTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(), - Passed(std::move(output_file)), - std::move(success_callback), std::move(failure_callback), - progress_callback, current_progress)); + std::move(output_file), std::move(success_callback), + std::move(failure_callback), progress_callback, + current_progress)); } } |