Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7111: MachoLoader library fix, and calling updateRecord() in MemorySymbol.setLibrary()

Ryan Kurtz4cfb27ded8c4
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
index 5f78c0be9a..dec364a3b1 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
@@ -1840,12 +1840,7 @@ public class MachoProgramBuilder {
ExternalLocation loc =
extManager.getUniqueExternalLocation(Library.UNKNOWN, symbol);
if (loc != null) {
- try {
- loc.setName(null, symbol, SourceType.IMPORTED);
- }
- catch (InvalidInputException e) {
- throw new Exception(e.getMessage());
- }
+ loc.setLibrary(library);
}
}
}
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/MemorySymbol.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/MemorySymbol.java
index 173818cea6..fcdc84d84d 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/MemorySymbol.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/MemorySymbol.java
@@ -383,6 +383,7 @@ public abstract class MemorySymbol extends SymbolDB {
}
checkDeleted();
record.setLongValue(SymbolDatabaseAdapter.SYMBOL_LIBRARY_ID_COL, newLibrary.getID());
+ updateRecord();
ProgramDB program = symbolMgr.getProgram();
program.symbolChanged(this, ProgramEvent.SYMBOL_LIBRARY_CHANGED, getAddress(), this,
oldLibrary, newLibrary);