summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Object/ELFObjectFile.cpp
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2015-06-04 23:14:43 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2015-06-04 23:14:43 +0000
commit49179ddba4d6a5b0a768936da42a7694ddf0b780 (patch)
treef94dc94b177abfe587cb34aec9d533873934fd8e /llvm/lib/Object/ELFObjectFile.cpp
parent00f7d9ecc8229b0dd36d362f82b4f09869d12e71 (diff)
downloadbcm5719-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
Diffstat (limited to 'llvm/lib/Object/ELFObjectFile.cpp')
-rw-r--r--llvm/lib/Object/ELFObjectFile.cpp5
1 files changed, 3 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)
OpenPOWER on IntegriCloud