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

Fixing NPE in GhidraApplicationLayout when the layout is used from the

Browse source 
GhidraDev Eclipse plugin
This commit is contained in:
Ryan Kurtz 2020-09-24 08:30:30 -04:00
parent 02e017f507
commit 50a580e728
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java
View file

@ -96,14 +96,21 @@ public class GhidraApplicationLayout extends ApplicationLayout {
// Application properties // Application properties
applicationProperties = new ApplicationProperties(applicationRootDirs); applicationProperties = new ApplicationProperties(applicationRootDirs);
// Modules
modules = findGhidraModules();
// User directories // User directories
userTempDir = ApplicationUtilities.getDefaultUserTempDir(getApplicationProperties()); userTempDir = ApplicationUtilities.getDefaultUserTempDir(getApplicationProperties());
userCacheDir = ApplicationUtilities.getDefaultUserCacheDir(getApplicationProperties()); userCacheDir = ApplicationUtilities.getDefaultUserCacheDir(getApplicationProperties());
userSettingsDir = ApplicationUtilities.getDefaultUserSettingsDir(getApplicationProperties(), userSettingsDir = ApplicationUtilities.getDefaultUserSettingsDir(getApplicationProperties(),
getApplicationInstallationDir()); getApplicationInstallationDir());
// Extensions
extensionInstallationDirs = findExtensionInstallationDirectories();
extensionArchiveDir = findExtensionArchiveDirectory();
// Patch directory
patchDir = findPatchDirectory();
// Modules
modules = findGhidraModules();
} }
/** /**