Update Crashpad to 8e37886d418dd042c3c7bfadac99214739ee4d98

third_party/crashpad/crashpad/minidump/minidump_module_writer_test.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_module_writer.h"
 
+#include <stddef.h>
 #include <string.h>
 
 #include <utility>
 
 #include "base/format_macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
@@ skipping 33 matching lines @@
 
   *module_list = MinidumpWritableAtLocationDescriptor<MINIDUMP_MODULE_LIST>(
       file_contents, directory[0].Location);
   ASSERT_TRUE(module_list);
 }
 
 TEST(MinidumpModuleWriter, EmptyModuleList) {
   MinidumpFileWriter minidump_file_writer;
   auto module_list_writer = base::WrapUnique(new MinidumpModuleListWriter());
 
-  minidump_file_writer.AddStream(std::move(module_list_writer));
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(module_list_writer)));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_EQ(sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST),
             string_file.string().size());
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 188 matching lines @@
 TEST(MinidumpModuleWriter, EmptyModule) {
   MinidumpFileWriter minidump_file_writer;
   auto module_list_writer = base::WrapUnique(new MinidumpModuleListWriter());
 
   const char kModuleName[] = "test_executable";
 
   auto module_writer = base::WrapUnique(new MinidumpModuleWriter());
   module_writer->SetName(kModuleName);
 
   module_list_writer->AddModule(std::move(module_writer));
-  minidump_file_writer.AddStream(std::move(module_list_writer));
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(module_list_writer)));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_GT(string_file.string().size(),
             sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST) + 1 * sizeof(MINIDUMP_MODULE));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 70 matching lines @@
   codeview_pdb70_writer->SetUUIDAndAge(pdb_uuid, kPDBAge);
   module_writer->SetCodeViewRecord(std::move(codeview_pdb70_writer));
 
   auto misc_debug_writer =
       base::WrapUnique(new MinidumpModuleMiscDebugRecordWriter());
   misc_debug_writer->SetDataType(kDebugType);
   misc_debug_writer->SetData(kDebugName, kDebugUTF16);
   module_writer->SetMiscDebugRecord(std::move(misc_debug_writer));
 
   module_list_writer->AddModule(std::move(module_writer));
-  minidump_file_writer.AddStream(std::move(module_list_writer));
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(module_list_writer)));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_GT(string_file.string().size(),
             sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST) + 1 * sizeof(MINIDUMP_MODULE));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 54 matching lines @@
   codeview_pdb20_writer->SetTimestampAndAge(kPDBTimestamp, kPDBAge);
   module_writer->SetCodeViewRecord(std::move(codeview_pdb20_writer));
 
   auto misc_debug_writer =
       base::WrapUnique(new MinidumpModuleMiscDebugRecordWriter());
   misc_debug_writer->SetDataType(kDebugType);
   misc_debug_writer->SetData(kDebugName, kDebugUTF16);
   module_writer->SetMiscDebugRecord(std::move(misc_debug_writer));
 
   module_list_writer->AddModule(std::move(module_writer));
-  minidump_file_writer.AddStream(std::move(module_list_writer));
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(module_list_writer)));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_GT(string_file.string().size(),
             sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST) + 1 * sizeof(MINIDUMP_MODULE));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 71 matching lines @@
   module_writer_2->SetImageSize(kModuleSize2);
 
   auto codeview_pdb70_writer_2 =
       base::WrapUnique(new MinidumpModuleCodeViewRecordPDB20Writer());
   codeview_pdb70_writer_2->SetPDBName(kPDBName2);
   codeview_pdb70_writer_2->SetTimestampAndAge(kPDBTimestamp2, kPDBAge2);
   module_writer_2->SetCodeViewRecord(std::move(codeview_pdb70_writer_2));
 
   module_list_writer->AddModule(std::move(module_writer_2));
 
-  minidump_file_writer.AddStream(std::move(module_list_writer));
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(module_list_writer)));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_GT(string_file.string().size(),
             sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MODULE_LIST) + 1 * sizeof(MINIDUMP_MODULE));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 98 matching lines @@
   }
   module_snapshot->SetModuleType(module_type);
 
   module_snapshot->SetUUIDAndAge(uuid, age);
   module_snapshot->SetDebugFileName(pdb_name);
 }
 
 TEST(MinidumpModuleWriter, InitializeFromSnapshot) {
   MINIDUMP_MODULE expect_modules[3] = {};
   const char* module_paths[arraysize(expect_modules)] = {};
-  const char* module_names[arraysize(expect_modules)] = {};
   const char* module_pdbs[arraysize(expect_modules)] = {};
   UUID uuids[arraysize(expect_modules)] = {};
   uint32_t ages[arraysize(expect_modules)] = {};
 
   expect_modules[0].BaseOfImage = 0x100101000;
   expect_modules[0].SizeOfImage = 0xf000;
   expect_modules[0].TimeDateStamp = 0x01234567;
   expect_modules[0].VersionInfo.dwFileVersionMS = 0x00010002;
   expect_modules[0].VersionInfo.dwFileVersionLS = 0x00030004;
   expect_modules[0].VersionInfo.dwProductVersionMS = 0x00050006;
   expect_modules[0].VersionInfo.dwProductVersionLS = 0x00070008;
   expect_modules[0].VersionInfo.dwFileType = VFT_APP;
   module_paths[0] = "/usr/bin/true";
-  module_names[0] = "true";
   module_pdbs[0] = "true";
   const uint8_t kUUIDBytes0[16] =
       {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
        0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
   uuids[0].InitializeFromBytes(kUUIDBytes0);
   ages[0] = 10;
 
   expect_modules[1].BaseOfImage = 0x200202000;
   expect_modules[1].SizeOfImage = 0x1e1000;
   expect_modules[1].TimeDateStamp = 0x89abcdef;
   expect_modules[1].VersionInfo.dwFileVersionMS = 0x0009000a;
   expect_modules[1].VersionInfo.dwFileVersionLS = 0x000b000c;
   expect_modules[1].VersionInfo.dwProductVersionMS = 0x000d000e;
   expect_modules[1].VersionInfo.dwProductVersionLS = 0x000f0000;
   expect_modules[1].VersionInfo.dwFileType = VFT_DLL;
   module_paths[1] = "/usr/lib/libSystem.B.dylib";
-  module_names[1] = "libSystem.B.dylib";
   module_pdbs[1] = "libSystem.B.dylib.pdb";
   const uint8_t kUUIDBytes1[16] =
       {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f};
   uuids[1].InitializeFromBytes(kUUIDBytes1);
   ages[1] = 20;
 
   expect_modules[2].BaseOfImage = 0x300303000;
   expect_modules[2].SizeOfImage = 0x2d000;
   expect_modules[2].TimeDateStamp = 0x76543210;
   expect_modules[2].VersionInfo.dwFileVersionMS = 0x11112222;
   expect_modules[2].VersionInfo.dwFileVersionLS = 0x33334444;
   expect_modules[2].VersionInfo.dwProductVersionMS = 0x9999aaaa;
   expect_modules[2].VersionInfo.dwProductVersionLS = 0xbbbbcccc;
   expect_modules[2].VersionInfo.dwFileType = VFT_UNKNOWN;
   module_paths[2] = "/usr/lib/dyld";
-  module_names[2] = "dyld";
   module_pdbs[2] = "/usr/lib/dyld.pdb";
   const uint8_t kUUIDBytes2[16] =
       {0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8,
        0xf7, 0xf6, 0xf5, 0xf4, 0xf3, 0xf2, 0xf1, 0xf0};
   uuids[2].InitializeFromBytes(kUUIDBytes2);
   ages[2] = 30;
 
   PointerVector<TestModuleSnapshot> module_snapshots_owner;
   std::vector<const ModuleSnapshot*> module_snapshots;
   for (size_t index = 0; index < arraysize(expect_modules); ++index) {
     TestModuleSnapshot* module_snapshot = new TestModuleSnapshot();
     module_snapshots_owner.push_back(module_snapshot);
     InitializeTestModuleSnapshotFromMinidumpModule(module_snapshot,
                                                    expect_modules[index],
                                                    module_paths[index],
                                                    module_pdbs[index],
                                                    uuids[index],
                                                    ages[index]);
     module_snapshots.push_back(module_snapshot);
   }
 
   auto module_list_writer = base::WrapUnique(new MinidumpModuleListWriter());
   module_list_writer->InitializeFromSnapshot(module_snapshots);
 
   MinidumpFileWriter minidump_file_writer;
-  minidump_file_writer.AddStream(std::move(module_list_writer));
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(module_list_writer)));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_MODULE_LIST* module_list = nullptr;
   ASSERT_NO_FATAL_FAILURE(
       GetModuleListStream(string_file.string(), &module_list));
 
   ASSERT_EQ(3u, module_list->NumberOfModules);
 
@@ skipping 11 matching lines @@
                                          0,
                                          false));
   }
 }
 
 TEST(MinidumpModuleWriterDeathTest, NoModuleName) {
   MinidumpFileWriter minidump_file_writer;
   auto module_list_writer = base::WrapUnique(new MinidumpModuleListWriter());
   auto module_writer = base::WrapUnique(new MinidumpModuleWriter());
   module_list_writer->AddModule(std::move(module_writer));
-  minidump_file_writer.AddStream(std::move(module_list_writer));
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(module_list_writer)));
 
   StringFile string_file;
   ASSERT_DEATH_CHECK(minidump_file_writer.WriteEverything(&string_file),
                      "name_");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad