diff options
author | Kevin Enderby <enderby@apple.com> | 2016-09-29 17:45:23 +0000 |
---|---|---|
committer | Kevin Enderby <enderby@apple.com> | 2016-09-29 17:45:23 +0000 |
commit | 245be3ed2ab4f49df8f7508d8251575720e7fd4d (patch) | |
tree | 8e35da56ac5f4ef620abdbb4c232141ff488daee /llvm/lib/Object | |
parent | a9b0dd0e5138aa0c48047bcbd75c9ee76767d11f (diff) | |
download | bcm5719-llvm-245be3ed2ab4f49df8f7508d8251575720e7fd4d.tar.gz bcm5719-llvm-245be3ed2ab4f49df8f7508d8251575720e7fd4d.zip |
Next set of additional error checks for invalid Mach-O files for the
load command that uses the Mach::source_version_command type
but not used in llvm libObject code but used in llvm tool code.
This includes just the LC_SOURCE_VERSION load command.
llvm-svn: 282736
Diffstat (limited to 'llvm/lib/Object')
-rw-r--r-- | llvm/lib/Object/MachOObjectFile.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index 36423946229..fd3cb5efcfb 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -750,6 +750,7 @@ MachOObjectFile::MachOObjectFile(MemoryBufferRef Object, bool IsLittleEndian, const char *SplitInfoLoadCmd = nullptr; const char *CodeSignDrsLoadCmd = nullptr; const char *VersLoadCmd = nullptr; + const char *SourceLoadCmd = nullptr; for (unsigned I = 0; I < LoadCommandCount; ++I) { if (is64Bit()) { if (Load.C.cmdsize % 8 != 0) { @@ -879,6 +880,17 @@ MachOObjectFile::MachOObjectFile(MemoryBufferRef Object, bool IsLittleEndian, } else if (Load.C.cmd == MachO::LC_RPATH) { if ((Err = checkRpathCommand(this, Load, I))) return; + } else if (Load.C.cmd == MachO::LC_SOURCE_VERSION) { + if (Load.C.cmdsize != sizeof(MachO::source_version_command)) { + Err = malformedError("LC_SOURCE_VERSION command " + Twine(I) + + " has incorrect cmdsize"); + return; + } + if (SourceLoadCmd) { + Err = malformedError("more than one LC_SOURCE_VERSION command"); + return; + } + SourceLoadCmd = Load.Ptr; } if (I < LoadCommandCount - 1) { if (auto LoadOrErr = getNextLoadCommandInfo(this, I, Load)) |