Update Crashpad to 32981a3ee9d7c2769fb27afa038fe2e194cfa329

third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "minidump/minidump_misc_info_writer.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "minidump/minidump_writer_util.h"
 #include "package.h"
 #include "snapshot/process_snapshot.h"
 #include "snapshot/system_snapshot.h"
 #include "util/file/file_writer.h"
+#include "util/misc/arraysize_unsafe.h"
 #include "util/numeric/in_range_cast.h"
 #include "util/numeric/safe_assignment.h"
 
 #if defined(OS_MACOSX)
 #include <AvailabilityMacros.h>
 #elif defined(OS_ANDROID)
 #include <android/api-level.h>
 #endif
 
 namespace crashpad {
@@ skipping 22 matching lines @@
           "%s; %s", os_version_full.c_str(), machine_description.c_str());
     }
     return os_version_full;
   }
   return machine_description;
 }
 
 #if defined(OS_MACOSX)
 // Converts the value of the MAC_OS_VERSION_MIN_REQUIRED or
 // MAC_OS_X_VERSION_MAX_ALLOWED macro from <AvailabilityMacros.h> to a number
-// identifying the minor Mac OS X version that it represents. For example, with
-// an argument of MAC_OS_X_VERSION_10_6, this function will return 6.
+// identifying the minor macOS version that it represents. For example, with an
+// argument of MAC_OS_X_VERSION_10_6, this function will return 6.
 int AvailabilityVersionToMacOSXMinorVersion(int availability) {
   // Through MAC_OS_X_VERSION_10_9, the minor version is the tens digit.
   if (availability >= 1000 && availability <= 1099) {
     return (availability / 10) % 10;
   }
 
   // After MAC_OS_X_VERSION_10_9, the older format was insufficient to represent
   // versions. Since then, the minor version is the thousands and hundreds
   // digits.
   if (availability >= 100000 && availability <= 109999) {
@@ skipping 205 matching lines @@
                                          const std::string& daylight_name,
                                          const SYSTEMTIME& daylight_date,
                                          int32_t daylight_bias) {
   DCHECK_EQ(state(), kStateMutable);
 
   misc_info_.TimeZoneId = time_zone_id;
   misc_info_.TimeZone.Bias = bias;
 
   internal::MinidumpWriterUtil::AssignUTF8ToUTF16(
       misc_info_.TimeZone.StandardName,
-      arraysize(misc_info_.TimeZone.StandardName),
+      ARRAYSIZE_UNSAFE(misc_info_.TimeZone.StandardName),
       standard_name);
 
   misc_info_.TimeZone.StandardDate = standard_date;
   misc_info_.TimeZone.StandardBias = standard_bias;
 
   internal::MinidumpWriterUtil::AssignUTF8ToUTF16(
       misc_info_.TimeZone.DaylightName,
-      arraysize(misc_info_.TimeZone.DaylightName),
+      ARRAYSIZE_UNSAFE(misc_info_.TimeZone.DaylightName),
       daylight_name);
 
   misc_info_.TimeZone.DaylightDate = daylight_date;
   misc_info_.TimeZone.DaylightBias = daylight_bias;
 
   misc_info_.Flags1 |= MINIDUMP_MISC3_TIMEZONE;
 }
 
 void MinidumpMiscInfoWriter::SetBuildString(
     const std::string& build_string,
     const std::string& debug_build_string) {
   DCHECK_EQ(state(), kStateMutable);
 
   misc_info_.Flags1 |= MINIDUMP_MISC4_BUILDSTRING;
 
   internal::MinidumpWriterUtil::AssignUTF8ToUTF16(
-      misc_info_.BuildString, arraysize(misc_info_.BuildString), build_string);
+      misc_info_.BuildString,
+      ARRAYSIZE_UNSAFE(misc_info_.BuildString),
+      build_string);
   internal::MinidumpWriterUtil::AssignUTF8ToUTF16(
       misc_info_.DbgBldStr,
-      arraysize(misc_info_.DbgBldStr),
+      ARRAYSIZE_UNSAFE(misc_info_.DbgBldStr),
       debug_build_string);
 }
 
 bool MinidumpMiscInfoWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!MinidumpStreamWriter::Freeze()) {
     return false;
   }
 
@@ skipping 33 matching lines @@
        MINIDUMP_MISC3_TIMEZONE | MINIDUMP_MISC3_PROTECTED_PROCESS)) {
     return sizeof(MINIDUMP_MISC_INFO_3);
   }
   if (misc_info_.Flags1 & MINIDUMP_MISC1_PROCESSOR_POWER_INFO) {
     return sizeof(MINIDUMP_MISC_INFO_2);
   }
   return sizeof(MINIDUMP_MISC_INFO);
 }
 
 }  // namespace crashpad