Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-base_debug_elf__reader.cc
| --- base/debug/elf_reader.cc.orig 2019-06-04 18:55:15 UTC | --- base/debug/elf_reader.cc.orig 2020-03-03 18:52:59 UTC | ||||
| +++ base/debug/elf_reader.cc | +++ base/debug/elf_reader.cc | ||||
| @@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, | @@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, | ||||
| reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr); | |||||
| bool found = false; | bool found = false; | ||||
| while (current_note < section_end) { | while (current_section < section_end) { | ||||
| current_note = reinterpret_cast<const Nhdr*>(current_section); | |||||
| +#if !defined(OS_BSD) | +#if !defined(OS_BSD) | ||||
| if (current_note->n_type == NT_GNU_BUILD_ID) { | if (current_note->n_type == NT_GNU_BUILD_ID) { | ||||
| const char* note_name = | StringPiece note_name(current_section + sizeof(Nhdr), | ||||
| reinterpret_cast<const char*>(current_note) + sizeof(Nhdr); | current_note->n_namesz); | ||||
| @@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, | @@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, | ||||
| break; | break; | ||||
| } | } | ||||
| } | } | ||||
| +#endif | +#endif | ||||
| current_note = reinterpret_cast<const Nhdr*>( | size_t section_size = bits::Align(current_note->n_namesz, 4) + | ||||
| reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) + | bits::Align(current_note->n_descsz, 4) + | ||||