diff options
| author | Kevin Enderby <enderby@apple.com> | 2016-10-24 21:15:11 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2016-10-24 21:15:11 +0000 |
| commit | 79d6c63f61daa82188f9627cef739c911f8b0b48 (patch) | |
| tree | ddceda6b7f4e74c68a3df86b72f677f411e60eab /llvm/lib/Object/MachOUniversal.cpp | |
| parent | d8ec09c74f8096946df4680d3aed878c472c97a4 (diff) | |
| download | bcm5719-llvm-79d6c63f61daa82188f9627cef739c911f8b0b48.tar.gz bcm5719-llvm-79d6c63f61daa82188f9627cef739c911f8b0b48.zip | |
nother additional error check for an invalid Mach-O file
when contained in a Mach-O universal file and the
cputypes in both headers don’t match.
llvm-svn: 285026
Diffstat (limited to 'llvm/lib/Object/MachOUniversal.cpp')
| -rw-r--r-- | llvm/lib/Object/MachOUniversal.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/llvm/lib/Object/MachOUniversal.cpp b/llvm/lib/Object/MachOUniversal.cpp index f36e84d93b9..bac9d4dd3e3 100644 --- a/llvm/lib/Object/MachOUniversal.cpp +++ b/llvm/lib/Object/MachOUniversal.cpp @@ -73,13 +73,17 @@ MachOUniversalBinary::ObjectForArch::getAsObjectFile() const { StringRef ParentData = Parent->getData(); StringRef ObjectData; - if (Parent->getMagic() == MachO::FAT_MAGIC) + uint32_t cputype; + if (Parent->getMagic() == MachO::FAT_MAGIC) { ObjectData = ParentData.substr(Header.offset, Header.size); - else // Parent->getMagic() == MachO::FAT_MAGIC_64 + cputype = Header.cputype; + } else { // Parent->getMagic() == MachO::FAT_MAGIC_64 ObjectData = ParentData.substr(Header64.offset, Header64.size); + cputype = Header64.cputype; + } StringRef ObjectName = Parent->getFileName(); MemoryBufferRef ObjBuffer(ObjectData, ObjectName); - return ObjectFile::createMachOObjectFile(ObjBuffer); + return ObjectFile::createMachOObjectFile(ObjBuffer, cputype, Index); } Expected<std::unique_ptr<Archive>> |
