diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-05 22:10:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 22:10:57 +0000 |
| commit | 0537af6ee64dc40549be09ba730b87283bb5ddc9 (patch) | |
| tree | 5efae9e794d2a0443ef19b68513bb7156a30975d | |
| parent | d2dca3d8137c123657e7ba3c776c81f0a89b889e (diff) | |
| parent | 0650d43c9b1ef5cfc85d73353788d99df3540252 (diff) | |
| download | zlib-0537af6ee64dc40549be09ba730b87283bb5ddc9.tar.gz | |
Merge "Upgrade zlib to bf44340d1b6be1af8950bbdf664fec0cf5a831cc" am: deaa15577f am: 0650d43c9b
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1577245
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3389327e2d887cc8012318d89ef2063bd568b1bf
| -rw-r--r-- | METADATA | 4 | ||||
| -rw-r--r-- | adler32.c | 4 | ||||
| -rw-r--r-- | google/zip_internal.cc | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -5,11 +5,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/chromium/src/third_party/zlib/" } - version: "2c183c9f93a328bfb3121284da13cf89a0f7e64a" + version: "bf44340d1b6be1af8950bbdf664fec0cf5a831cc" license_type: NOTICE last_upgrade_date { year: 2021 - month: 1 + month: 2 day: 5 } } @@ -74,10 +74,10 @@ uLong ZEXPORT adler32_z(adler, buf, len) unsigned n; #if defined(ADLER32_SIMD_SSSE3) - if (x86_cpu_enable_ssse3 && buf && len >= 64) + if (buf != Z_NULL && len >= 64 && x86_cpu_enable_ssse3) return adler32_simd_(adler, buf, len); #elif defined(ADLER32_SIMD_NEON) - if (buf && len >= 64) + if (buf != Z_NULL && len >= 64) return adler32_simd_(adler, buf, len); #endif diff --git a/google/zip_internal.cc b/google/zip_internal.cc index 9cbb78c..354fbf8 100644 --- a/google/zip_internal.cc +++ b/google/zip_internal.cc @@ -56,10 +56,10 @@ void* ZipOpenFunc(void *opaque, const char* filename, int mode) { creation_disposition = CREATE_ALWAYS; } - base::string16 filename16 = base::UTF8ToUTF16(filename); + std::wstring filenamew = base::UTF8ToWide(filename); if ((filename != NULL) && (desired_access != 0)) { - file = CreateFile(filename16.c_str(), desired_access, share_mode, - NULL, creation_disposition, flags_and_attributes, NULL); + file = CreateFile(filenamew.c_str(), desired_access, share_mode, NULL, + creation_disposition, flags_and_attributes, NULL); } if (file == INVALID_HANDLE_VALUE) |