yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

GP-4608: Improving how we handle loading classes with the same name

Browse source
This commit is contained in:
Ryan Kurtz 2024-05-17 13:32:42 -04:00
parent 72d9d0eeb2
commit 87131b4762
6 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
View file

@ -165,6 +165,15 @@ public class GhidraLauncher {
else { /* Eclipse dev mode */
// Support loading pre-built, jar-based, non-repo extensions in Eclipse dev mode
addExtensionJarPaths(classpathList, modules, layout);
// Eclipse launches the Utility module, so it's already on the classpath. We don't
// want to add it a second time, so remove the one we discovered.
GModule utilityModule = modules.get("Utility");
if (utilityModule == null) {
throw new IOException("Failed to find the 'Utility' module!");
}
classpathList.removeIf(
e -> e.startsWith(utilityModule.getModuleRoot().getAbsolutePath()));
}
// In development mode, jars do not live in module directories. Instead, each jar lives