wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Object/ELF] - Do not crash if string table sh_size is equal to zero. 

Revealed using "id_000038,sig_11,src_000015,op_havoc,rep_16" from PR30540,
when sh_size was 0, crash happened.

Differential revision: https://reviews.llvm.org/D25091

llvm-svn: 285282
This commit is contained in:
George Rimar 2016-10-27 11:41:57 +00:00
parent d2611d50aa
commit 3fb09b3a9e
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/Object/ELF.h
View File

@ -428,6 +428,8 @@ ELFFile<ELFT>::getStringTable(const Elf_Shdr *Section) const {
if (std::error_code EC = V.getError()) if (std::error_code EC = V.getError())
return EC; return EC;
ArrayRef<char> Data = *V; ArrayRef<char> Data = *V;
if (Data.empty())
return object_error::parse_failed;
if (Data.back() != '\0') if (Data.back() != '\0')
return object_error::string_table_non_null_end; return object_error::string_table_non_null_end;
return StringRef(Data.begin(), Data.size()); return StringRef(Data.begin(), Data.size());

BIN
llvm/test/Object/Inputs/invalid-strtab-zero-size.elf Normal file
View File

Binary file not shown.

1
llvm/test/Object/invalid.test
View File

@ -1,6 +1,7 @@
RUN: not llvm-dwarfdump %p/Inputs/invalid-bad-rel-type.elf 2>&1 | FileCheck %s RUN: not llvm-dwarfdump %p/Inputs/invalid-bad-rel-type.elf 2>&1 | FileCheck %s
RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-type.elf 2>&1 | FileCheck %s RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-type.elf 2>&1 | FileCheck %s
RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-size.elf 2>&1 | FileCheck %s RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-size.elf 2>&1 | FileCheck %s
RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-zero-size.elf 2>&1 | FileCheck %s
CHECK: Invalid data was encountered while parsing the file CHECK: Invalid data was encountered while parsing the file
RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-non-null.elf 2>&1 | FileCheck --check-prefix=NON-NULL %s RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-non-null.elf 2>&1 | FileCheck --check-prefix=NON-NULL %s