diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-06-04 23:14:43 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-06-04 23:14:43 +0000 |
| commit | 49179ddba4d6a5b0a768936da42a7694ddf0b780 (patch) | |
| tree | f94dc94b177abfe587cb34aec9d533873934fd8e | |
| parent | 00f7d9ecc8229b0dd36d362f82b4f09869d12e71 (diff) | |
| download | bcm5719-llvm-49179ddba4d6a5b0a768936da42a7694ddf0b780.tar.gz bcm5719-llvm-49179ddba4d6a5b0a768936da42a7694ddf0b780.zip | |
[Object, ELF] Don't assert on invalid magic in createELFObjectFile.
Instead, return a proper error code from factory.
llvm-svn: 239116
| -rw-r--r-- | llvm/lib/Object/ELFObjectFile.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/Inputs/invalid.elf.3 | 1 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/dwarfdump-invalid.test | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/llvm/lib/Object/ELFObjectFile.cpp b/llvm/lib/Object/ELFObjectFile.cpp index 1ffdc01bcd3..c7df30a5903 100644 --- a/llvm/lib/Object/ELFObjectFile.cpp +++ b/llvm/lib/Object/ELFObjectFile.cpp @@ -39,14 +39,15 @@ ObjectFile::createELFObjectFile(MemoryBufferRef Obj) { R.reset(new ELFObjectFile<ELFType<support::big, false>>(Obj, EC)); else return object_error::parse_failed; - } else { - assert(Ident.first == ELF::ELFCLASS64); + } else if (Ident.first == ELF::ELFCLASS64) { if (Ident.second == ELF::ELFDATA2LSB) R.reset(new ELFObjectFile<ELFType<support::little, true>>(Obj, EC)); else if (Ident.second == ELF::ELFDATA2MSB) R.reset(new ELFObjectFile<ELFType<support::big, true>>(Obj, EC)); else return object_error::parse_failed; + } else { + return object_error::parse_failed; } if (EC) diff --git a/llvm/test/DebugInfo/Inputs/invalid.elf.3 b/llvm/test/DebugInfo/Inputs/invalid.elf.3 new file mode 100644 index 00000000000..f4944600004 --- /dev/null +++ b/llvm/test/DebugInfo/Inputs/invalid.elf.3 @@ -0,0 +1 @@ +ELF‚Lþ'ELFB
\ No newline at end of file diff --git a/llvm/test/DebugInfo/dwarfdump-invalid.test b/llvm/test/DebugInfo/dwarfdump-invalid.test index 5b616bd5581..da5b23e30ce 100644 --- a/llvm/test/DebugInfo/dwarfdump-invalid.test +++ b/llvm/test/DebugInfo/dwarfdump-invalid.test @@ -2,4 +2,5 @@ RUN: llvm-dwarfdump %p/Inputs/invalid.elf 2>&1 | FileCheck %s --check-prefix=INVALID-ELF 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 |
