mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GP-2802_ryanmkurtz_MachOProgramTree' into patch

Browse Source 
(Closes #4724)
This commit is contained in:
Ryan Kurtz
2022-11-08 09:45:14 -05:00
parent b5537b91e5 924f84b3c3
commit d5b0bacdd4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
View File

@@ -427,8 +427,18 @@ public class MachoProgramBuilder {
break; break;
} }
} }
if (segmentFragment == null) {
log.appendMsg("Could not find/fixup segment in Program Tree: " + segmentName);
continue;
}
ProgramModule segmentModule = rootModule.createModule(segmentName); ProgramModule segmentModule = rootModule.createModule(segmentName);
segmentModule.reparent(noSectionsName, rootModule); try {
segmentModule.reparent(noSectionsName, rootModule);
}
catch (NotFoundException e) {
log.appendException(e);
continue;
}
// Add the sections, which will remove overlapped ranges from the segment fragment // Add the sections, which will remove overlapped ranges from the segment fragment
for (Section section : segment.getSections()) { for (Section section : segment.getSections()) {