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

GP-4461: Fixing some Mach-O string/symbol table load errors

Browse source
This commit is contained in:
Ryan Kurtz 2024-03-25 13:41:56 -04:00
parent 568ebd45ef
commit eca1a025c8
4 changed files with 27 additions and 16 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/macho/commands/DynamicSymbolTableCommand.java
View file

@ -386,7 +386,7 @@ public class DynamicSymbolTableCommand extends LoadCommand {
symbolTableAddr.add(nlistIndex * nlist.getSize()), RefType.DATA, symbolTableAddr.add(nlistIndex * nlist.getSize()), RefType.DATA,
SourceType.IMPORTED, 0); SourceType.IMPORTED, 0);
referenceManager.setPrimary(ref, true); referenceManager.setPrimary(ref, true);
if (stringTableAddr != null) { if (stringTableAddr != null && nlist.getStringTableIndex() != 0) {
Address strAddr = stringTableAddr.add(nlist.getStringTableIndex()); Address strAddr = stringTableAddr.add(nlist.getStringTableIndex());
referenceManager.addMemoryReference(dataAddr, strAddr, RefType.DATA, referenceManager.addMemoryReference(dataAddr, strAddr, RefType.DATA,
SourceType.IMPORTED, 0); SourceType.IMPORTED, 0);

13
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/NList.java
View file

@ -69,11 +69,14 @@ public class NList implements StructConverter {
* @param stringTableOffset offset of the string table * @param stringTableOffset offset of the string table
*/ */
public void initString(BinaryReader reader, long stringTableOffset) { public void initString(BinaryReader reader, long stringTableOffset) {
try { string = "";
string = reader.readAsciiString(stringTableOffset + n_strx); if (n_strx != 0) {
} try {
catch (Exception e) { string = reader.readAsciiString(stringTableOffset + n_strx);
string = ""; }
catch (Exception e) {
// use empty string
}
} }
} }

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/SymbolTableCommand.java
View file

@ -200,7 +200,7 @@ public class SymbolTableCommand extends LoadCommand {
Data d = DataUtilities.createData(program, nlistAddr, dt, -1, Data d = DataUtilities.createData(program, nlistAddr, dt, -1,
DataUtilities.ClearDataMode.CHECK_FOR_SPACE); DataUtilities.ClearDataMode.CHECK_FOR_SPACE);
if (stringTableAddr != null) { if (stringTableAddr != null && nlist.getStringTableIndex() != 0) {
Address strAddr = stringTableAddr.add(nlist.getStringTableIndex()); Address strAddr = stringTableAddr.add(nlist.getStringTableIndex());
DataUtilities.createData(program, strAddr, STRING, -1, DataUtilities.createData(program, strAddr, STRING, -1,
DataUtilities.ClearDataMode.CHECK_FOR_SPACE); DataUtilities.ClearDataMode.CHECK_FOR_SPACE);

26
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
View file

@ -1450,23 +1450,31 @@ public class MachoProgramBuilder {
if (address.compareTo(block.getEnd()) > 0) { if (address.compareTo(block.getEnd()) > 0) {
break; break;
} }
int length;
try { try {
listing.createData(address, datatype); listing.createData(address, datatype);
length = listing.getDataAt(address).getLength(); if (datatype instanceof Pointer) {
fixupThumbPointers(address);
}
address = address.add(listing.getDataAt(address).getLength());
} }
catch (Exception e) { catch (CodeUnitInsertionException e) {
// don't worry about exceptions if (datatype instanceof TerminatedStringDataType) {
// may have already been created, by relocation, or chain pointers // Sometimes there are huge strings, like JSON blobs
if (!(datatype instanceof Pointer)) { log.appendMsg("Skipping markup for large string at: " + address);
}
else if (!(datatype instanceof Pointer)) {
// May have already been created, by relocation, or chain pointers
log.appendMsg("Skipping markup for existing pointer at: " + address);
}
else {
log.appendException(e); log.appendException(e);
} }
return; return;
} }
if (datatype instanceof Pointer) { catch (Exception e) {
fixupThumbPointers(address); log.appendException(e);
return;
} }
address = address.add(length);
} }
} }