diff --git a/Ghidra/Features/Base/.launch/Ghidra.launch b/Ghidra/Features/Base/.launch/Ghidra.launch index e9f428a5d1..57ffb40efd 100644 --- a/Ghidra/Features/Base/.launch/Ghidra.launch +++ b/Ghidra/Features/Base/.launch/Ghidra.launch @@ -30,5 +30,5 @@ - + diff --git a/Ghidra/Framework/Generic/src/main/java/generic/continues/ContinuesFactory.java b/Ghidra/Framework/Generic/src/main/java/generic/continues/ContinuesFactory.java index fea0d21187..f8b017a25e 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/continues/ContinuesFactory.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/continues/ContinuesFactory.java @@ -21,7 +21,7 @@ import net.sf.cglib.proxy.Enhancer; public class ContinuesFactory implements GenericFactory { - private static final boolean disabled = Boolean.getBoolean("ContinuesInterceptor.disabled"); + private static final boolean enabled = Boolean.getBoolean("ContinuesInterceptor.enabled"); private ExceptionHandler exceptionHandler; @@ -36,7 +36,7 @@ public class ContinuesFactory implements GenericFactory { public Object create(Class type, Object... args) { try { Object thing; - if (disabled) { + if (!enabled) { Constructor c = type.getConstructor(new Class[0]); thing = c.newInstance(args); } diff --git a/Ghidra/RuntimeScripts/Common/support/launch.properties b/Ghidra/RuntimeScripts/Common/support/launch.properties index 19a22926f8..75f6b8fbb9 100644 --- a/Ghidra/RuntimeScripts/Common/support/launch.properties +++ b/Ghidra/RuntimeScripts/Common/support/launch.properties @@ -101,9 +101,9 @@ VMARGS=--illegal-access=permit #VMARGS=-Ddisable.alternating.row.colors=true # The ContinuesInterceptor allows the import process to proceed if parsing corrupted headers -# generates uncaught exceptions. Disabling it can be helpful when trying to debug what went -# wrong because the ContinuesIntercepter affects the usefulness of the stack trace. -#VMARGS=-DContinuesInterceptor.disabled=true +# generates uncaught exceptions. Its usage has been deprecated and will be removed in a future +# release of Ghidra. It is disabled by default. +#VMARGS=-DContinuesInterceptor.enabled=true # Limit on XML parsing. See https://docs.oracle.com/javase/tutorial/jaxp/limits/limits.html #VMARGS=-Djdk.xml.totalEntitySizeLimit=50000000