diff options
| -rw-r--r-- | llvm/include/llvm/Object/ELFObjectFile.h | 2 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-objdump/X86/elf-disassemble-bss.test | 37 |
2 files changed, 39 insertions, 0 deletions
diff --git a/llvm/include/llvm/Object/ELFObjectFile.h b/llvm/include/llvm/Object/ELFObjectFile.h index 424289a9cca..8a68e49477f 100644 --- a/llvm/include/llvm/Object/ELFObjectFile.h +++ b/llvm/include/llvm/Object/ELFObjectFile.h @@ -723,6 +723,8 @@ template <class ELFT> Expected<ArrayRef<uint8_t>> ELFObjectFile<ELFT>::getSectionContents(DataRefImpl Sec) const { const Elf_Shdr *EShdr = getSection(Sec); + if (EShdr->sh_type == ELF::SHT_NOBITS) + return makeArrayRef((const uint8_t *)base(), 0); if (std::error_code EC = checkOffset(getMemoryBufferRef(), (uintptr_t)base() + EShdr->sh_offset, EShdr->sh_size)) diff --git a/llvm/test/tools/llvm-objdump/X86/elf-disassemble-bss.test b/llvm/test/tools/llvm-objdump/X86/elf-disassemble-bss.test new file mode 100644 index 00000000000..01d3a49c9b5 --- /dev/null +++ b/llvm/test/tools/llvm-objdump/X86/elf-disassemble-bss.test @@ -0,0 +1,37 @@ +## Check that when BSS is larger than the file llvm-objdump doesn't +## assert with an unexpected end of file error. +# RUN: yaml2obj --docnum=1 %s > %t +# RUN: yaml2obj --docnum=2 %s > %t.2 +# RUN: llvm-objdump -D %t | FileCheck %s +# RUN: llvm-objdump -D %t.2 | FileCheck %s + +# CHECK: Disassembly of section .bss: +# CHECK: .bss: +# CHECK-NEXT: ... + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Machine: EM_X86_64 +Sections: + - Name: .bss + Type: SHT_NOBITS + Flags: [ SHF_WRITE, SHF_ALLOC ] + Size: 0x0000000000001000 +... + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Machine: EM_X86_64 +Sections: + - Name: .bss + Type: SHT_NOBITS + Flags: [ SHF_WRITE, SHF_ALLOC ] + Size: 0x0000000000001000 + ShOffset: 0x0000000080000000 +... |
