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

Fixing a bug in the DYLD cache loader.

Browse source
This commit is contained in:
Ryan Kurtz 2019-08-01 12:02:34 -04:00
parent c8603123b4
commit fc3146ba91
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/DyldCacheProgramBuilder.java
View file

@ -223,9 +223,10 @@ public class DyldCacheProgramBuilder extends MachoProgramBuilder {
// easier
monitor.setMessage("Parsing DYLIB's...");
monitor.initialize(dyldCacheHeader.getImageInfos().size());
List<DyldCacheMachoInfo> infoList = new ArrayList<>(dyldCacheHeader.getImageInfos().size());
TreeSet<DyldCacheMachoInfo> infoSet =
new TreeSet<>((a, b) -> a.headerAddr.compareTo(b.headerAddr));
for (DyldCacheImageInfo dyldCacheImageInfo : dyldCacheHeader.getImageInfos()) {
infoList.add(new DyldCacheMachoInfo(provider,
infoSet.add(new DyldCacheMachoInfo(provider,
dyldCacheImageInfo.getAddress() - dyldCacheHeader.getBaseAddress(),
space.getAddress(dyldCacheImageInfo.getAddress()), dyldCacheImageInfo.getPath()));
monitor.checkCanceled();
@ -234,8 +235,8 @@ public class DyldCacheProgramBuilder extends MachoProgramBuilder {
// Markup DyldCache Mach-O headers
monitor.setMessage("Marking up DYLIB headers...");
monitor.initialize(infoList.size());
for (DyldCacheMachoInfo info : infoList) {
monitor.initialize(infoSet.size());
for (DyldCacheMachoInfo info : infoSet) {
info.markupHeaders();
monitor.checkCanceled();
monitor.incrementProgress(1);
@ -243,8 +244,8 @@ public class DyldCacheProgramBuilder extends MachoProgramBuilder {
// Add DyldCache Mach-O's to program tree
monitor.setMessage("Adding DYLIB's to program tree...");
monitor.initialize(infoList.size());
Iterator<DyldCacheMachoInfo> iter = infoList.iterator();
monitor.initialize(infoSet.size());
Iterator<DyldCacheMachoInfo> iter = infoSet.iterator();
if (iter.hasNext()) {
DyldCacheMachoInfo curr = iter.next();
do {
@ -259,8 +260,8 @@ public class DyldCacheProgramBuilder extends MachoProgramBuilder {
// Process DyldCache DYLIB memory blocks.
monitor.setMessage("Processing DYLIB memory blocks...");
monitor.initialize(infoList.size());
for (DyldCacheMachoInfo info : infoList) {
monitor.initialize(infoSet.size());
for (DyldCacheMachoInfo info : infoSet) {
info.processMemoryBlocks();
monitor.checkCanceled();
monitor.incrementProgress(1);