development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-08-27 21:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-6414_haarlaj_mz-source-fix'

Browse source
This commit is contained in:
Ryan Kurtz 2024-04-29 13:03:04 -04:00
parent 239234c2e1 567d32a4f2
commit 96ff764a43
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java
View file

@ -294,10 +294,12 @@ public class MzLoader extends AbstractLibrarySupportLoader {
// split here and join to previous
Address splitAddr = offAddr.add(1);
String oldName = block.getName();
String oldSourceName = block.getSourceName();
memory.split(block, splitAddr);
memory.join(blocks[i - 1], blocks[i]);
blocks = memory.getBlocks();
blocks[i].setName(oldName);
blocks[i].setSourceName(oldSourceName);
break;
}
}