Merge "Upgrade zlib to bf44340d1b6be1af8950bbdf664fec0cf5a831cc"

3 files changed, 7 insertions, 7 deletions

diff --git a/METADATA b/METADATA
index 134d2c1..fe534c8 100644
--- a/METADATA
+++ b/METADATA
@@ -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
   }
 }
diff --git a/adler32.c b/adler32.c
index 696773a..8f8fbb9 100644
--- a/adler32.c
+++ b/adler32.c
@@ -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)