Skip to content

Ghidra is a software reverse engineering (SRE) framework

Objective-C Message Analyzer: guard two lookups that abort the analysis

Giovanni Condellof1cf0864708f
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.java
index ded91bf1f1..f21f309233 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
@@ -323,6 +323,10 @@ public class ObjcMessageAnalyzer extends AbstractAnalyzer {
int stretParamShift = isStructReturnCall(program, inputs[0], monitor) ? 1 : 0;
boolean isStub = isObjcMsgSendStub(program, callTarget);
+ if (inputs.length <= (isStub ? 1 : 2) + stretParamShift) {
+ // The decompiler found fewer parameters than the message send needs
+ continue;
+ }
Varnode receiverParam = inputs[1 + stretParamShift];
Varnode selectorParam = !isStub ? inputs[2 + stretParamShift] : null;
String receiver =
@@ -964,8 +968,9 @@ public class ObjcMessageAnalyzer extends AbstractAnalyzer {
List<Symbol> functionSymbols = symbolTable.getSymbols(currentMethodName, namespace);
if (functionSymbols.isEmpty()) {
// Walk up the superclass chain to see if the method is inherited
+ // null for class namespaces without Objective-C metadata (e.g. external classes)
List<Objc2Class> classList = classMap.get(namespace.getName());
- if (classList.size() == 1) {
+ if (classList != null && classList.size() == 1) {
Objc2Class superClass = classList.getFirst().getSuperClass();
if (superClass != null) {
Objc2ClassRW data = superClass.getData();