Switch the Linux minidump writer to use MDCVInfoELF for CV data.

src/common/linux/file_id_unittest.cc

 // Copyright (c) 2010, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 69 matching lines @@
   AutoTempDir temp_dir;
   string templ = temp_dir.path() + "/file-id-unittest";
   char cmdline[4096];
   sprintf(cmdline, "cp \"%s\" \"%s\"", exe_name, templ.c_str());
   ASSERT_EQ(0, system(cmdline)) << "Failed to execute: " << cmdline;
   sprintf(cmdline, "chmod u+w \"%s\"", templ.c_str());
   ASSERT_EQ(0, system(cmdline)) << "Failed to execute: " << cmdline;
   sprintf(cmdline, "strip \"%s\"", templ.c_str());
   ASSERT_EQ(0, system(cmdline)) << "Failed to execute: " << cmdline;
 
-  uint8_t identifier1[sizeof(MDGUID)];
-  uint8_t identifier2[sizeof(MDGUID)];
+  uint8_t identifier1[kMaxBuildID];
+  size_t identifier1_length;
+  uint8_t identifier2[kMaxBuildID];
+  size_t identifier2_length;
   FileID fileid1(exe_name);
-  EXPECT_TRUE(fileid1.ElfFileIdentifier(identifier1));
+  EXPECT_TRUE(fileid1.ElfFileIdentifier(identifier1, &identifier1_length));
   FileID fileid2(templ.c_str());
-  EXPECT_TRUE(fileid2.ElfFileIdentifier(identifier2));
+  EXPECT_TRUE(fileid2.ElfFileIdentifier(identifier2, &identifier2_length));
   char identifier_string1[37];
   char identifier_string2[37];
   FileID::ConvertIdentifierToString(identifier1, identifier_string1,
                                     37);
   FileID::ConvertIdentifierToString(identifier2, identifier_string2,
                                     37);
   EXPECT_STREQ(identifier_string1, identifier_string2);
 }
 #endif  // !__ANDROID__
 
@@ skipping 12 matching lines @@
 
   vector<uint8_t> elfdata_v;
   uint8_t* elfdata;
 };
 
 typedef Types<ElfClass32, ElfClass64> ElfClasses;
 
 TYPED_TEST_CASE(FileIDTest, ElfClasses);
 
 TYPED_TEST(FileIDTest, ElfClass) {
-  uint8_t identifier[sizeof(MDGUID)];
+  uint8_t identifier[kMaxBuildID];
+  size_t identifier_length;
   const char expected_identifier_string[] =
       "80808080-8080-0000-0000-008080808080";
   char identifier_string[sizeof(expected_identifier_string)];
   const size_t kTextSectionSize = 128;
 
   ELF elf(EM_386, TypeParam::kClass, kLittleEndian);
   Section text(kLittleEndian);
   for (size_t i = 0; i < kTextSectionSize; ++i) {
     text.D8(i * 3);
   }
   elf.AddSection(".text", text, SHT_PROGBITS);
   elf.Finish();
   this->GetElfContents(elf);
 
   EXPECT_TRUE(FileID::ElfFileIdentifierFromMappedFile(this->elfdata,
-                                                      identifier));
+                                                      identifier,
+                                                      &identifier_length));
 
   FileID::ConvertIdentifierToString(identifier, identifier_string,
                                     sizeof(identifier_string));
   EXPECT_STREQ(expected_identifier_string, identifier_string);
 }
 
 TYPED_TEST(FileIDTest, BuildID) {
-  const uint8_t kExpectedIdentifier[sizeof(MDGUID)] =
+  const uint8_t kExpectedIdentifier[kMaxBuildID] =
     {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F};
+     0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+     0x10, 0x11, 0x12, 0x13};
   char expected_identifier_string[] =
     "00000000-0000-0000-0000-000000000000";
   FileID::ConvertIdentifierToString(kExpectedIdentifier,
                                     expected_identifier_string,
                                     sizeof(expected_identifier_string));
 
-  uint8_t identifier[sizeof(MDGUID)];
+  uint8_t identifier[kMaxBuildID];
+  size_t identifier_length;
   char identifier_string[sizeof(expected_identifier_string)];
 
   ELF elf(EM_386, TypeParam::kClass, kLittleEndian);
   Section text(kLittleEndian);
   text.Append(4096, 0);
   elf.AddSection(".text", text, SHT_PROGBITS);
   Notes notes(kLittleEndian);
   notes.AddNote(NT_GNU_BUILD_ID, "GNU", kExpectedIdentifier,
                 sizeof(kExpectedIdentifier));
   elf.AddSection(".note.gnu.build-id", notes, SHT_NOTE);
   elf.Finish();
   this->GetElfContents(elf);
 
   EXPECT_TRUE(FileID::ElfFileIdentifierFromMappedFile(this->elfdata,
-                                                      identifier));
+                                                      identifier,
+                                                      &identifier_length));
+  EXPECT_EQ(sizeof(kExpectedIdentifier), identifier_length);
 
   FileID::ConvertIdentifierToString(identifier, identifier_string,
                                     sizeof(identifier_string));
   EXPECT_STREQ(expected_identifier_string, identifier_string);
 }
 
 TYPED_TEST(FileIDTest, BuildIDPH) {
-  const uint8_t kExpectedIdentifier[sizeof(MDGUID)] =
+  const uint8_t kExpectedIdentifier[kMaxBuildID] =
     {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F};
+     0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+     0x10, 0x11, 0x12, 0x13};
   char expected_identifier_string[] =
     "00000000-0000-0000-0000-000000000000";
   FileID::ConvertIdentifierToString(kExpectedIdentifier,
                                     expected_identifier_string,
                                     sizeof(expected_identifier_string));
 
-  uint8_t identifier[sizeof(MDGUID)];
+  uint8_t identifier[kMaxBuildID];
+  size_t identifier_length;
   char identifier_string[sizeof(expected_identifier_string)];
 
   ELF elf(EM_386, TypeParam::kClass, kLittleEndian);
   Section text(kLittleEndian);
   text.Append(4096, 0);
   elf.AddSection(".text", text, SHT_PROGBITS);
   Notes notes(kLittleEndian);
   notes.AddNote(0, "Linux",
                 reinterpret_cast<const uint8_t *>("\0x42\0x02\0\0"), 4);
   notes.AddNote(NT_GNU_BUILD_ID, "GNU", kExpectedIdentifier,
                 sizeof(kExpectedIdentifier));
   int note_idx = elf.AddSection(".note", notes, SHT_NOTE);
   elf.AddSegment(note_idx, note_idx, PT_NOTE);
   elf.Finish();
   this->GetElfContents(elf);
 
   EXPECT_TRUE(FileID::ElfFileIdentifierFromMappedFile(this->elfdata,
-                                                      identifier));
+                                                      identifier,
+                                                      &identifier_length));
+  EXPECT_EQ(sizeof(kExpectedIdentifier), identifier_length);
 
   FileID::ConvertIdentifierToString(identifier, identifier_string,
                                     sizeof(identifier_string));
   EXPECT_STREQ(expected_identifier_string, identifier_string);
 }
 
 // Test to make sure two files with different text sections produce
 // different hashes when not using a build id.
 TYPED_TEST(FileIDTest, UniqueHashes) {
   char identifier_string_1[] =
     "00000000-0000-0000-0000-000000000000";
   char identifier_string_2[] =
     "00000000-0000-0000-0000-000000000000";
-  uint8_t identifier_1[sizeof(MDGUID)];
-  uint8_t identifier_2[sizeof(MDGUID)];
+  uint8_t identifier_1[kMaxBuildID];
+  size_t identifier_1_size;
+  uint8_t identifier_2[kMaxBuildID];
+  size_t identifier_2_size;
 
   {
     ELF elf1(EM_386, TypeParam::kClass, kLittleEndian);
     Section foo_1(kLittleEndian);
     PopulateSection(&foo_1, 32, 5);
     elf1.AddSection(".foo", foo_1, SHT_PROGBITS);
     Section text_1(kLittleEndian);
     PopulateSection(&text_1, 4096, 17);
     elf1.AddSection(".text", text_1, SHT_PROGBITS);
     elf1.Finish();
     this->GetElfContents(elf1);
   }
 
   EXPECT_TRUE(FileID::ElfFileIdentifierFromMappedFile(this->elfdata,
-                                                      identifier_1));
+                                                      identifier_1,
+                                                      &identifier_1_size));
   FileID::ConvertIdentifierToString(identifier_1, identifier_string_1,
                                     sizeof(identifier_string_1));
 
   {
     ELF elf2(EM_386, TypeParam::kClass, kLittleEndian);
     Section text_2(kLittleEndian);
     Section foo_2(kLittleEndian);
     PopulateSection(&foo_2, 32, 5);
     elf2.AddSection(".foo", foo_2, SHT_PROGBITS);
     PopulateSection(&text_2, 4096, 31);
     elf2.AddSection(".text", text_2, SHT_PROGBITS);
     elf2.Finish();
     this->GetElfContents(elf2);
   }
 
   EXPECT_TRUE(FileID::ElfFileIdentifierFromMappedFile(this->elfdata,
-                                                      identifier_2));
+                                                      identifier_2,
+                                                      &identifier_2_size));
   FileID::ConvertIdentifierToString(identifier_2, identifier_string_2,
                                     sizeof(identifier_string_2));
 
   EXPECT_STRNE(identifier_string_1, identifier_string_2);
 }