Ghidra is a software reverse engineering (SRE) framework
GP-5396: Fixing regression in Mach-O FileSet extraction (Closes #8194)
Ryan Kurtz7b01e2a5959d
diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/MachoFileSetExtractLoader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/MachoFileSetExtractLoader.javaindex 102ec23eab..8eb476f4ca 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/MachoFileSetExtractLoader.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/MachoFileSetExtractLoader.java@@ -23,9 +23,11 @@ import ghidra.app.util.Option;import ghidra.app.util.bin.ByteProvider;import ghidra.app.util.importer.MessageLog;import ghidra.file.formats.ios.fileset.MachoFileSetExtractor;+import ghidra.formats.gfilesystem.FSRL;import ghidra.framework.model.DomainObject;import ghidra.framework.model.Project;import ghidra.program.database.mem.FileBytes;+import ghidra.program.model.listing.Group;import ghidra.program.model.listing.Program;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;@@ -55,7 +57,8 @@ public class MachoFileSetExtractLoader extends MachoLoader {try {FileBytes fileBytes = MemoryBlockUtils.createFileBytes(program, provider, monitor);- MachoExtractProgramBuilder.buildProgram(program, provider, fileBytes, log, monitor);+ MachoExtractProgramBuilder.buildProgram(program, provider, fileBytes, false, log,+ monitor);}catch (CancelledException e) {return;@@ -70,9 +73,28 @@ public class MachoFileSetExtractLoader extends MachoLoader {@Overrideprotected void loadProgramInto(ByteProvider provider, LoadSpec loadSpec, List<Option> options,- MessageLog messageLog, Program program, TaskMonitor monitor)+ MessageLog log, Program program, TaskMonitor monitor)throws IOException, LoadException, CancelledException {- load(provider, loadSpec, options, program, monitor, messageLog);+ FSRL fsrl = provider.getFSRL();+ Group[] children = program.getListing().getDefaultRootModule().getChildren();+ if (Arrays.stream(children).anyMatch(e -> e.getName().contains(fsrl.getPath()))) {+ log.appendMsg("%s has already been added".formatted(fsrl.getPath()));+ return;+ }+ try {+ FileBytes fileBytes = MemoryBlockUtils.createFileBytes(program, provider, monitor);+ MachoExtractProgramBuilder.buildProgram(program, provider, fileBytes, true, log,+ monitor);+ }+ catch (CancelledException e) {+ return;+ }+ catch (IOException e) {+ throw e;+ }+ catch (Exception e) {+ throw new IOException(e);+ }}@Override