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

GP-5545_5600: ProgramLoader and more flexible loader args

Browse source
This commit is contained in:
Ryan Kurtz 2025-07-01 08:18:36 -04:00
parent 4aa78ae6d0
commit d3aed2c4b3
47 changed files with 2026 additions and 976 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/ApkLoader.java
View file

@ -103,13 +103,13 @@ public class ApkLoader extends DexLoader {
}
finally {
if (!success) {
release(allLoadedPrograms, consumer);
allLoadedPrograms.forEach(Loaded::close);
}
}
if (allLoadedPrograms.isEmpty()) {
throw new LoadException("Operation finished with no programs to load");
}
link(allLoadedPrograms.stream().map(e -> e.getDomainObject()).toList(), log, monitor);
link(allLoadedPrograms, log, monitor);
return allLoadedPrograms;
}
@ -300,11 +300,9 @@ public class ApkLoader extends DexLoader {
* @param log the message log
* @param monitor the task monitor
*/
private void link(List<Program> programList, MessageLog log, TaskMonitor monitor) {
MultiDexLinker linker = new MultiDexLinker(programList);
try {
private void link(List<Loaded<Program>> programList, MessageLog log, TaskMonitor monitor) {
try (MultiDexLinker linker = new MultiDexLinker(programList)) {
linker.link(monitor);
linker.clear(monitor);
}
catch (Exception e) {
log.appendException(e);

42
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/multidex/MultiDexLinker.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -16,33 +16,20 @@
package ghidra.file.formats.android.multidex;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import ghidra.app.util.opinion.Loaded;
import ghidra.file.formats.android.dex.DexHeaderFactory;
import ghidra.file.formats.android.dex.format.DexHeader;
import ghidra.file.formats.android.dex.format.MethodIDItem;
import ghidra.file.formats.android.dex.util.DexUtil;
import ghidra.program.model.address.Address;
import ghidra.program.model.address.AddressSet;
import ghidra.program.model.listing.Data;
import ghidra.program.model.listing.DataIterator;
import ghidra.program.model.listing.Program;
import ghidra.program.model.listing.*;
import ghidra.program.model.mem.MemoryAccessException;
import ghidra.program.model.mem.MemoryBlock;
import ghidra.program.model.symbol.ExternalLocation;
import ghidra.program.model.symbol.ExternalManager;
import ghidra.program.model.symbol.ExternalReference;
import ghidra.program.model.symbol.RefType;
import ghidra.program.model.symbol.Reference;
import ghidra.program.model.symbol.ReferenceManager;
import ghidra.program.model.symbol.SourceType;
import ghidra.util.exception.CancelledException;
import ghidra.util.exception.DuplicateNameException;
import ghidra.util.exception.InvalidInputException;
import ghidra.program.model.symbol.*;
import ghidra.util.exception.*;
import ghidra.util.task.TaskMonitor;
/**
@ -50,7 +37,7 @@ import ghidra.util.task.TaskMonitor;
* via the "method_lookup" section using
* external references.
*/
public final class MultiDexLinker {
public final class MultiDexLinker implements AutoCloseable {
private List<Program> programs;
private Map<Program, DexHeader> dexMap = new HashMap<>();
@ -109,8 +96,11 @@ public final class MultiDexLinker {
}
}
public MultiDexLinker(List<Program> programs) {
this.programs = new ArrayList<>(programs);//create copy of list
public MultiDexLinker(List<Loaded<Program>> loadedPrograms) {
this.programs = new ArrayList<>();
for (Loaded<Program> loaded : loadedPrograms) {
this.programs.add(loaded.getDomainObject(this));
}
}
public void link(TaskMonitor monitor) throws CancelledException, IOException,
@ -121,12 +111,12 @@ public final class MultiDexLinker {
linkPrograms(monitor);
}
public void clear(TaskMonitor monitor) throws CancelledException {
Objects.requireNonNull(monitor);
@Override
public void close() {
programs.forEach(p -> p.release(this));
programs.clear();
dexMap.clear();
for (DexHeader header : cmpMap.keySet()) {
monitor.checkCancelled();
cmpMap.get(header).clear();
}
cmpMap.clear();