Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 00:56:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-4432_ryanmkurtz_programtree--SQUASHED' into Ghidra_11.1
(Closes #6277)
This commit is contained in:
Ryan Kurtz
2024-05-22 13:04:23 -04:00
parent 587307eefe 3c00ea0295
commit 982dc01eb7
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java
+5
View File
@@ -26,6 +26,7 @@ import ghidra.app.util.bin.ByteProvider;
import ghidra.app.util.bin.format.mz.*; import ghidra.app.util.bin.format.mz.*;
import ghidra.app.util.importer.MessageLog; import ghidra.app.util.importer.MessageLog;
import ghidra.program.database.mem.FileBytes; import ghidra.program.database.mem.FileBytes;
import ghidra.program.database.module.TreeManager;
import ghidra.program.model.address.*; import ghidra.program.model.address.*;
import ghidra.program.model.data.DataType; import ghidra.program.model.data.DataType;
import ghidra.program.model.data.DataUtilities; import ghidra.program.model.data.DataUtilities;
@@ -314,6 +315,10 @@ public class MzLoader extends AbstractLibrarySupportLoader {
} }
} }
} }
// Recreate the Program Tree since it may now be out of sync
program.getListing().removeTree(TreeManager.DEFAULT_TREE_NAME);
program.getListing().createRootModule(TreeManager.DEFAULT_TREE_NAME);
} }
private void processRelocations(Program program, SegmentedAddressSpace space, MzExecutable mz, private void processRelocations(Program program, SegmentedAddressSpace space, MzExecutable mz,