diff --git a/Ghidra/Features/Base/.launch/Ghidra.launch b/Ghidra/Features/Base/.launch/Ghidra.launch index c619ef5bd6..08b3e245f3 100644 --- a/Ghidra/Features/Base/.launch/Ghidra.launch +++ b/Ghidra/Features/Base/.launch/Ghidra.launch @@ -18,6 +18,7 @@ + @@ -30,5 +31,5 @@ - + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleHost.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleHost.java index a448d5ca7e..09fae3f929 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleHost.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleHost.java @@ -39,7 +39,8 @@ import ghidra.framework.Application; import ghidra.framework.options.SaveState; import ghidra.framework.plugintool.PluginTool; import ghidra.util.Msg; -import ghidra.util.task.*; +import ghidra.util.task.TaskLauncher; +import ghidra.util.task.TaskMonitor; /** * Hosts the embedded OSGi framework and manages {@link GhidraBundle}s. @@ -418,6 +419,9 @@ public class BundleHost { // setup the cache path config.setProperty(Constants.FRAMEWORK_STORAGE, makeCacheDir()); + + // disable felix url handlers service (performs illegal access to java.net module) + config.setProperty(FelixConstants.SERVICE_URLHANDLERS_PROP, "false"); config.put(FelixConstants.LOG_LEVEL_PROP, "1"); if (STDERR_DEBUGGING) { diff --git a/Ghidra/RuntimeScripts/Common/support/launch.properties b/Ghidra/RuntimeScripts/Common/support/launch.properties index 735d476abb..180dc17100 100644 --- a/Ghidra/RuntimeScripts/Common/support/launch.properties +++ b/Ghidra/RuntimeScripts/Common/support/launch.properties @@ -72,7 +72,6 @@ VMARGS=-Xshare:off # Permit "illegal reflective accesses" to enable JDK compatibility with Ghidra and 3rd party jars. VMARGS=--add-opens java.base/java.lang=ALL-UNNAMED VMARGS=--add-opens java.base/java.util=ALL-UNNAMED -VMARGS=--add-opens java.base/java.net=ALL-UNNAMED VMARGS=--add-opens java.desktop/sun.awt.image=ALL-UNNAMED VMARGS_LINUX=--add-opens java.desktop/sun.awt.X11=ALL-UNNAMED