From 6aaf9139ee17cac07938857c17a9adbdbf946c89 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Fri, 4 Nov 2022 18:32:39 -0400 Subject: [PATCH] GP-0 added safety check for eclipse bin directory treatment as module root. Moved DataType extension point to SoftwareModeling. --- Ghidra/Features/Base/data/ExtensionPoint.manifest | 1 - .../Framework/SoftwareModeling/data/ExtensionPoint.manifest | 1 + .../src/main/java/utility/module/ModuleUtilities.java | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Ghidra/Features/Base/data/ExtensionPoint.manifest b/Ghidra/Features/Base/data/ExtensionPoint.manifest index 32324026b7..b0f36eb07d 100644 --- a/Ghidra/Features/Base/data/ExtensionPoint.manifest +++ b/Ghidra/Features/Base/data/ExtensionPoint.manifest @@ -1,5 +1,4 @@ Analyzer -DataType Demangler Exporter FieldFactory diff --git a/Ghidra/Framework/SoftwareModeling/data/ExtensionPoint.manifest b/Ghidra/Framework/SoftwareModeling/data/ExtensionPoint.manifest index beb1a5c958..93f63cf976 100644 --- a/Ghidra/Framework/SoftwareModeling/data/ExtensionPoint.manifest +++ b/Ghidra/Framework/SoftwareModeling/data/ExtensionPoint.manifest @@ -3,3 +3,4 @@ RelocationHandler LanguageProvider LanguageTranslator Constraint +DataType diff --git a/Ghidra/Framework/Utility/src/main/java/utility/module/ModuleUtilities.java b/Ghidra/Framework/Utility/src/main/java/utility/module/ModuleUtilities.java index 72ae0a48ae..28a6ec612e 100644 --- a/Ghidra/Framework/Utility/src/main/java/utility/module/ModuleUtilities.java +++ b/Ghidra/Framework/Utility/src/main/java/utility/module/ModuleUtilities.java @@ -63,6 +63,11 @@ public class ModuleUtilities { */ public static boolean isModuleDirectory(Path path) { File file = path.toFile(); + if ("bin".equals(file.getName())) { + // Prevent eclipse project bin directory from being treated as module root + // since files frequently get copied from root into bin + return false; + } return new File(file, MANIFEST_FILE_NAME).exists(); }