From 50a580e728516b33ec9ab4b0ffdeceec950aeed4 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Thu, 24 Sep 2020 08:30:30 -0400 Subject: [PATCH] Fixing NPE in GhidraApplicationLayout when the layout is used from the GhidraDev Eclipse plugin --- .../main/java/ghidra/GhidraApplicationLayout.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java index 348b37458e..646634fb89 100644 --- a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java +++ b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraApplicationLayout.java @@ -96,14 +96,21 @@ public class GhidraApplicationLayout extends ApplicationLayout { // Application properties applicationProperties = new ApplicationProperties(applicationRootDirs); - // Modules - modules = findGhidraModules(); - // User directories userTempDir = ApplicationUtilities.getDefaultUserTempDir(getApplicationProperties()); userCacheDir = ApplicationUtilities.getDefaultUserCacheDir(getApplicationProperties()); userSettingsDir = ApplicationUtilities.getDefaultUserSettingsDir(getApplicationProperties(), getApplicationInstallationDir()); + + // Extensions + extensionInstallationDirs = findExtensionInstallationDirectories(); + extensionArchiveDir = findExtensionArchiveDirectory(); + + // Patch directory + patchDir = findPatchDirectory(); + + // Modules + modules = findGhidraModules(); } /**