Revert "[Object, ELF] Fix segmentation fault in ELFFile::getSectionName()."
authorAlexey Samsonov <vonosmas@gmail.com>
Thu, 4 Jun 2015 23:58:31 +0000 (23:58 +0000)
committerAlexey Samsonov <vonosmas@gmail.com>
Thu, 4 Jun 2015 23:58:31 +0000 (23:58 +0000)
This reverts commit r239124.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239125 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/Object/ELF.h
test/DebugInfo/Inputs/invalid.elf.no-shstrtab [deleted file]
test/DebugInfo/dwarfdump-invalid.test

index bca09bf7208f887d6e3a4493adf170b123227efe..e87737dcce7a65f32df728a3d0ab6222d519bea7 100644 (file)
@@ -928,7 +928,7 @@ ErrorOr<StringRef> ELFFile<ELFT>::getSymbolName(const Elf_Shdr *Section,
 template <class ELFT>
 ErrorOr<StringRef>
 ELFFile<ELFT>::getSectionName(const Elf_Shdr *Section) const {
-  if (!dot_shstrtab_sec || Section->sh_name >= dot_shstrtab_sec->sh_size)
+  if (Section->sh_name >= dot_shstrtab_sec->sh_size)
     return object_error::parse_failed;
   return StringRef(getString(dot_shstrtab_sec, Section->sh_name));
 }
diff --git a/test/DebugInfo/Inputs/invalid.elf.no-shstrtab b/test/DebugInfo/Inputs/invalid.elf.no-shstrtab
deleted file mode 100644 (file)
index e599695..0000000
Binary files a/test/DebugInfo/Inputs/invalid.elf.no-shstrtab and /dev/null differ
index 4236d4f85e48378cc182499692b527811d1fecdd..da5b23e30ceb9fe9280d1bf5f4bdc541e689886e 100644 (file)
@@ -4,6 +4,3 @@ RUN: llvm-dwarfdump %p/Inputs/invalid.elf 2>&1 | FileCheck %s --check-prefix=INV
 RUN: llvm-dwarfdump %p/Inputs/invalid.elf.2 2>&1 | FileCheck %s --check-prefix=INVALID-ELF
 RUN: llvm-dwarfdump %p/Inputs/invalid.elf.3 2>&1 | FileCheck %s --check-prefix=INVALID-ELF
 INVALID-ELF: Invalid data was encountered while parsing the file
-
-RUN: llvm-dwarfdump %p/Inputs/invalid.elf.no-shstrtab 2>&1 | FileCheck %s --check-prefix=EMPTY
-EMPTY: .debug_info contents: