From 98bd12e76d4027dee4e6ded1176583bb79945a0c Mon Sep 17 00:00:00 2001 From: Katy Coe Date: Sat, 12 Sep 2020 13:20:23 +0200 Subject: [PATCH] MachO: Accept file types other than MH_EXECUTE (#67) --- .../FileFormatReaders/FormatLayouts/MachO.cs | 5 +++-- Il2CppInspector.Common/FileFormatReaders/MachOReader.cs | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Il2CppInspector.Common/FileFormatReaders/FormatLayouts/MachO.cs b/Il2CppInspector.Common/FileFormatReaders/FormatLayouts/MachO.cs index b71c3f5..157b5ce 100644 --- a/Il2CppInspector.Common/FileFormatReaders/FormatLayouts/MachO.cs +++ b/Il2CppInspector.Common/FileFormatReaders/FormatLayouts/MachO.cs @@ -1,5 +1,5 @@ /* - Copyright 2017-2020 Katy Coe - http://www.hearthcode.org - http://www.djkaty.com + Copyright 2017-2020 Katy Coe - http://www.djkaty.com - https://github.com/djkaty All rights reserved. */ @@ -19,7 +19,8 @@ namespace Il2CppInspector MH_MAGIC_64 = 0xfeedfacf, MH_CIGAM_64 = 0xcffaedfe, - MH_EXECUTE = 0x2, + MH_MIN_FILETYPE = 0x1, + MH_MAX_FILETYPE = 0xB, LC_SEGMENT = 0x1, LC_SYMTAB = 0x2, diff --git a/Il2CppInspector.Common/FileFormatReaders/MachOReader.cs b/Il2CppInspector.Common/FileFormatReaders/MachOReader.cs index 8596efc..2a3404c 100644 --- a/Il2CppInspector.Common/FileFormatReaders/MachOReader.cs +++ b/Il2CppInspector.Common/FileFormatReaders/MachOReader.cs @@ -102,8 +102,8 @@ namespace Il2CppInspector header = ReadObject>(0); - // Must be executable file - if ((MachO)header.FileType != MachO.MH_EXECUTE) + // Must be of a known file type + if ((MachO)header.FileType < MachO.MH_MIN_FILETYPE || (MachO)header.FileType > MachO.MH_MAX_FILETYPE) return false; // Process load commands