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

GT-2845: Removing MemoryConflictHandler.

Browse source
This commit is contained in:
Ryan Kurtz 2019-07-16 14:08:25 -04:00
parent 07129cca77
commit 7617f30756
36 changed files with 103 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/FileFormats/ghidra_scripts/MergeTwoProgramsScript.java
View file

@ -28,7 +28,6 @@ import java.util.Iterator;
import ghidra.app.script.GhidraScript;
import ghidra.app.util.MemoryBlockUtil;
import ghidra.app.util.NamespaceUtils;
import ghidra.app.util.importer.MemoryConflictHandler;
import ghidra.program.model.listing.*;
import ghidra.program.model.mem.*;
import ghidra.program.model.symbol.*;
@ -242,8 +241,7 @@ public class MergeTwoProgramsScript extends GhidraScript {
private void mergeMemory( Program currProgram, Program otherProgram ) throws Exception {
monitor.setMessage( "Merging memory..." );
MemoryConflictHandler memoryConflictHandler = MemoryConflictHandler.ALWAYS_OVERWRITE;
MemoryBlockUtil mbu = new MemoryBlockUtil( currProgram, memoryConflictHandler );
MemoryBlockUtil mbu = new MemoryBlockUtil(currProgram);
try {
Memory otherMemory = otherProgram.getMemory();
MemoryBlock [] otherBlocks = otherMemory.getBlocks();