Ghidra is a software reverse engineering (SRE) framework
Objective-C Message Analyzer: create ID and SEL when the program defines no classes
Christopher Pruijsen8a81073fb06d
diff --git a/Ghidra/Features/Objective-C/src/main/java/ghidra/app/plugin/core/analysis/ObjcMessageAnalyzer.java b/Ghidra/Features/Objective-C/src/main/java/ghidra/app/plugin/core/analysis/ObjcMessageAnalyzer.javaindex ded91bf1f1..a9804f4aa0 100644--- a/Ghidra/Features/Objective-C/src/main/java/ghidra/app/plugin/core/analysis/ObjcMessageAnalyzer.java+++ b/Ghidra/Features/Objective-C/src/main/java/ghidra/app/plugin/core/analysis/ObjcMessageAnalyzer.java@@ -124,10 +124,7 @@ public class ObjcMessageAnalyzer extends AbstractAnalyzer {}if (dataTypes == null) {- dataTypes = getDataTypes(program, log);- if (dataTypes == null) {- return false;- }+ dataTypes = getDataTypes(program);}// Fix __objc_msgSend() function signatures@@ -190,7 +187,7 @@ public class ObjcMessageAnalyzer extends AbstractAnalyzer {}}- private DataTypes getDataTypes(Program program, MessageLog log) {+ private DataTypes getDataTypes(Program program) {// Get the data types that we'll need to useProgramBasedDataTypeManager dtm = program.getDataTypeManager();CategoryPath cat = Objc2Constants.CATEGORY_PATH;@@ -200,14 +197,20 @@ public class ObjcMessageAnalyzer extends AbstractAnalyzer {DataType sel = dtm.getDataType(cat, "SEL");DataType classT = dtm.getDataType(cat, "class_t");DataType messageRef = dtm.getDataType(cat, "message_ref");++ // A program that sends messages but defines no classes or methods has no metadata to+ // create ID and SEL from, so create them the same way Objc1TypeEncodings does.+ // Without class_t, objc_super.super_class is a plain pointer.+ if (id == null) {+ id = new TypedefDataType(cat, "ID",+ ptrSize == 8 ? new QWordDataType() : new DWordDataType());+ }+ if (sel == null) {+ sel = new TypedefDataType(cat, "SEL", new PointerDataType(new CharDataType(), ptrSize));+ }if (messageRef == null) {messageRef = id;}- if (ObjectUtils.anyNull(id, sel, messageRef, classT)) {- log.appendMsg("ERROR: Required Objective-C data type not found in data type manager");- log.appendMsg("Try adding libobjc.dylib");- return null;- }DataType messageRefPtr = new PointerDataType(messageRef, ptrSize);StructureDataType objcSuper = new StructureDataType(cat, "objc_super", 0);objcSuper.add(id, "receiver", null);