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

GP-5478: Cleaning up library loading code

Browse source
This commit is contained in:
Ryan Kurtz 2025-03-06 13:28:28 -05:00
parent 636f28dbdc
commit 3f9f79b49f
10 changed files with 205 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/ApkLoader.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.
@ -89,8 +89,8 @@ public class ApkLoader extends DexLoader {
// defer to the super class (DexLoader) to actually load the DEX file
List<Loaded<Program>> loadedPrograms =
super.loadProgram(dexProvider, classesDexFile.getName(), project,
concatenatePaths(programFolderPath, programName), loadSpec, options,
log, consumer, monitor);
joinPaths(programFolderPath, programName), loadSpec, options, log,
consumer, monitor);
allLoadedPrograms.addAll(loadedPrograms);
}

2
Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/DyldCacheExtractLoader.java
View file

@ -175,7 +175,7 @@ public class DyldCacheExtractLoader extends MachoLoader {
@Override
protected void postLoadProgramFixups(List<Loaded<Program>> loadedPrograms, Project project,
List<Option> options, MessageLog messageLog, TaskMonitor monitor)
LoadSpec loadSpec, List<Option> options, MessageLog messageLog, TaskMonitor monitor)
throws CancelledException, IOException {
// Do nothing
}

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

@ -108,7 +108,7 @@ public class MachoFileSetExtractLoader extends MachoLoader {
@Override
protected void postLoadProgramFixups(List<Loaded<Program>> loadedPrograms, Project project,
List<Option> options, MessageLog messageLog, TaskMonitor monitor)
LoadSpec loadSpec, List<Option> options, MessageLog messageLog, TaskMonitor monitor)
throws CancelledException, IOException {
// Do nothing
}