yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Refixed relative objc methods issue in #3611.

Browse source 
Added null check for ObjectiveC2_class.
This commit is contained in:
ArandomDev 2021-12-29 13:26:01 -05:00 • committed by Ryan Kurtz
parent 7a45cf24f1
commit 116b12badb
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Class.java
View file

@ -52,7 +52,7 @@ public class ObjectiveC2_Class implements StructConverter {
AddressSpace space = _state.program.getAddressFactory().getDefaultAddressSpace(); AddressSpace space = _state.program.getAddressFactory().getDefaultAddressSpace();
Address addr = space.getAddress(_index); Address addr = space.getAddress(_index);
Symbol symbol = _state.program.getSymbolTable().getPrimarySymbol(addr); Symbol symbol = _state.program.getSymbolTable().getPrimarySymbol(addr);
if (symbol.getParentNamespace().getName().equals(SectionNames.SECT_GOT)) { if (symbol != null && symbol.getParentNamespace().getName().equals(SectionNames.SECT_GOT)) {
return; return;
} }

10
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/objc2/ObjectiveC2_Method.java
View file

@ -37,9 +37,13 @@ public class ObjectiveC2_Method extends ObjectiveC_Method {
if (isSmallList) { if (isSmallList) {
int nameOffset = (int)ObjectiveC1_Utilities.readNextIndex(reader, true); int nameOffset = (int)ObjectiveC1_Utilities.readNextIndex(reader, true);
int namePtr = reader.readInt(_index + nameOffset); long namePtr;
long imagebase = state.program.getImageBase().getOffset(); // When we support dyld_shared_cache, this base will likely have to change if (state.is32bit)
name = reader.readAsciiString(imagebase + namePtr); namePtr = reader.readInt(_index + nameOffset);
else
namePtr = reader.readLong(_index + nameOffset);
name = reader.readAsciiString(namePtr);
int typesOffset = (int)ObjectiveC1_Utilities.readNextIndex(reader, true); int typesOffset = (int)ObjectiveC1_Utilities.readNextIndex(reader, true);
types = reader.readAsciiString(_index + 4 + typesOffset); types = reader.readAsciiString(_index + 4 + typesOffset);