Merge remote-tracking branch 'origin/Ghidra_11.1'

NationalSecurityAgency · May 22, 2024 · a858bd3 · a858bd3
2 parents 1371bb5 + 982dc01
commit a858bd3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java
@@ -26,6 +26,7 @@
 import ghidra.app.util.bin.format.mz.*;
 import ghidra.app.util.importer.MessageLog;
 import ghidra.program.database.mem.FileBytes;
+import ghidra.program.database.module.TreeManager;
 import ghidra.program.model.address.*;
 import ghidra.program.model.data.DataType;
 import ghidra.program.model.data.DataUtilities;
@@ -314,6 +315,10 @@ private void adjustSegmentStarts(Program program, TaskMonitor monitor) throws Ex
 				}
 			}
 		}
+
+		// 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,