From 62d21d2b1a6fb25210544160f6a7c4af6e17a583 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Thu, 4 Jun 2015 22:26:44 +0000 Subject: [PATCH] [Object, MachO] Don't crash on incomplete MachO segment load commands. Report proper error code from MachOObjectFile constructor if we can't parse another segment load command (we already return a proper error if segment load command contents is suspicious). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239109 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/MachOObjectFile.cpp | 5 ++++- ...macho64-invalid-incomplete-segment-load-command | Bin 0 -> 64 bytes test/Object/macho-invalid.test | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 test/Object/Inputs/macho64-invalid-incomplete-segment-load-command diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp index a824db5f34d..dc7c56c98ac 100644 --- a/lib/Object/MachOObjectFile.cpp +++ b/lib/Object/MachOObjectFile.cpp @@ -207,7 +207,10 @@ static std::error_code parseSegmentLoadCommand( const unsigned SegmentLoadSize = sizeof(SegmentCmd); if (Load.C.cmdsize < SegmentLoadSize) return object_error::macho_load_segment_too_small; - SegmentCmd S = getStruct(Obj, Load.Ptr); + auto SegOrErr = getStructOrErr(Obj, Load.Ptr); + if (!SegOrErr) + return SegOrErr.getError(); + SegmentCmd S = SegOrErr.get(); const unsigned SectionSize = Obj->is64Bit() ? sizeof(MachO::section_64) : sizeof(MachO::section); if (S.nsects > std::numeric_limits::max() / SectionSize || diff --git a/test/Object/Inputs/macho64-invalid-incomplete-segment-load-command b/test/Object/Inputs/macho64-invalid-incomplete-segment-load-command new file mode 100644 index 0000000000000000000000000000000000000000..82ec7246bdb7f4d637acb1887872eb5a99381ed0 GIT binary patch literal 64 lcmX^A>+L^w1_nlE1|R{%EI@n#L?{3;5J&=X1c;9V001F!1ug&p literal 0 HcmV?d00001 diff --git a/test/Object/macho-invalid.test b/test/Object/macho-invalid.test index 8bc11508dd5..f4aa1e0c298 100644 --- a/test/Object/macho-invalid.test +++ b/test/Object/macho-invalid.test @@ -37,3 +37,6 @@ INVALID-SECTION-IDX-SYMBOL-SEC: getSymbolSection: Invalid section index RUN: not llvm-objdump -private-headers %p/Inputs/macho-invalid-header 2>&1 | FileCheck -check-prefix INVALID-HEADER %s INVALID-HEADER: Invalid data was encountered while parsing the file + +RUN: not llvm-objdump -private-headers %p/Inputs/macho64-invalid-incomplete-segment-load-command 2>&1 | FileCheck -check-prefix INCOMPLETE-SEGMENT-LOADC %s +INCOMPLETE-SEGMENT-LOADC: Invalid data was encountered while parsing the file -- 2.34.1