development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-08-28 05:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2345_ghidraffe_shared-performance-projects--SQUASHED'

Browse source
This commit is contained in:
Ryan Kurtz 2022-09-12 13:01:37 -04:00
parent bfb15726d6 654d65b1c9
commit 975db1919c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/AnalyzeHeadless.java
View file

@ -25,8 +25,7 @@ import generic.stl.Pair;
import ghidra.GhidraApplicationLayout;
import ghidra.GhidraLaunchable;
import ghidra.app.util.opinion.Loader;
import ghidra.framework.OperatingSystem;
import ghidra.framework.Platform;
import ghidra.framework.*;
import ghidra.framework.model.DomainFolder;
import ghidra.framework.protocol.ghidra.Handler;
import ghidra.util.Msg;
@ -107,8 +106,15 @@ public class AnalyzeHeadless implements GhidraLaunchable {
}
// Instantiate new headless analyzer and parse options.
HeadlessAnalyzer analyzer =
HeadlessAnalyzer.getLoggableInstance(logFile, scriptLogFile, true);
// NOTE: The application may already be initialized if this is being called
// from an integration test
HeadlessAnalyzer analyzer = null;
if (Application.isInitialized()) {
analyzer = HeadlessAnalyzer.getInstance();
}
else {
analyzer = HeadlessAnalyzer.getLoggableInstance(logFile, scriptLogFile, true);
}
HeadlessOptions options = analyzer.getOptions();
parseOptions(options, args, optionStartIndex, ghidraURL, filesToImport);