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

GP-5396: Fixing regression in Mach-O FileSet extraction (Closes #8194)

Browse source
This commit is contained in:
Ryan Kurtz 2025-05-25 07:15:47 -04:00
parent da37f9d3c4
commit 7b01e2a595
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/MachoFileSetExtractLoader.java
View file

@ -23,9 +23,11 @@ import ghidra.app.util.Option;
import ghidra.app.util.bin.ByteProvider; import ghidra.app.util.bin.ByteProvider;
import ghidra.app.util.importer.MessageLog; import ghidra.app.util.importer.MessageLog;
import ghidra.file.formats.ios.fileset.MachoFileSetExtractor; import ghidra.file.formats.ios.fileset.MachoFileSetExtractor;
import ghidra.formats.gfilesystem.FSRL;
import ghidra.framework.model.DomainObject; import ghidra.framework.model.DomainObject;
import ghidra.framework.model.Project; import ghidra.framework.model.Project;
import ghidra.program.database.mem.FileBytes; import ghidra.program.database.mem.FileBytes;
import ghidra.program.model.listing.Group;
import ghidra.program.model.listing.Program; import ghidra.program.model.listing.Program;
import ghidra.util.exception.CancelledException; import ghidra.util.exception.CancelledException;
import ghidra.util.task.TaskMonitor; import ghidra.util.task.TaskMonitor;
@ -55,7 +57,8 @@ public class MachoFileSetExtractLoader extends MachoLoader {
try { try {
FileBytes fileBytes = MemoryBlockUtils.createFileBytes(program, provider, monitor); 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) { catch (CancelledException e) {
return; return;
@ -70,9 +73,28 @@ public class MachoFileSetExtractLoader extends MachoLoader {
@Override @Override
protected void loadProgramInto(ByteProvider provider, LoadSpec loadSpec, List<Option> options, protected 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 { 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 @Override