Index: src/common/linux/dump_symbols.cc |
diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc |
index d6c593fa3fd37bd0b4620ec96efc83ddc6d7b550..32b86c77579c2dabfd2839fb2942a67c81988ae8 100644 |
--- a/src/common/linux/dump_symbols.cc |
+++ b/src/common/linux/dump_symbols.cc |
@@ -82,9 +82,11 @@ using google_breakpad::DwarfLineToModule; |
using google_breakpad::ElfClass; |
using google_breakpad::ElfClass32; |
using google_breakpad::ElfClass64; |
+using google_breakpad::FileID; |
using google_breakpad::FindElfSectionByName; |
using google_breakpad::GetOffset; |
using google_breakpad::IsValidElf; |
+using google_breakpad::kMaxBuildID; |
using google_breakpad::Module; |
#ifndef NO_STABS_SUPPORT |
using google_breakpad::StabsToModule; |
@@ -827,9 +829,9 @@ const char* ElfArchitecture(const typename ElfClass::Ehdr* elf_header) { |
// Format the Elf file identifier in IDENTIFIER as a UUID with the |
// dashes removed. |
-string FormatIdentifier(unsigned char identifier[16]) { |
+string FormatIdentifier(unsigned char identifier[kMaxBuildID]) { |
char identifier_str[40]; |
- google_breakpad::FileID::ConvertIdentifierToString( |
+ FileID::ConvertIdentifierToString( |
identifier, |
identifier_str, |
sizeof(identifier_str)); |
@@ -895,9 +897,11 @@ bool ReadSymbolDataElfClass(const typename ElfClass::Ehdr* elf_header, |
*out_module = NULL; |
- unsigned char identifier[16]; |
- if (!google_breakpad::FileID::ElfFileIdentifierFromMappedFile(elf_header, |
- identifier)) { |
+ unsigned char identifier[kMaxBuildID]; |
+ size_t identifier_length; |
+ if (!FileID::ElfFileIdentifierFromMappedFile(elf_header, |
+ identifier, |
+ &identifier_length)) { |
fprintf(stderr, "%s: unable to generate file identifier\n", |
obj_filename.c_str()); |
return false; |