Ghidra is a software reverse engineering (SRE) framework
GP-6467 fix NPE in decompiler actions
dev74736836f71f05fdfb
diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.javaindex 8815b32993..059732bba5 100644--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java@@ -167,10 +167,10 @@ public abstract class AbstractDecompilerAction extends DockingAction {ClangToken token = context.getTokenAtCursor();Function f = null;- if (token instanceof ClangFuncNameToken) {- f = DecompilerUtils.getFunction(context.getProgram(), (ClangFuncNameToken) token);+ if (token instanceof ClangFuncNameToken funcNameToken) {+ f = DecompilerUtils.getFunction(context.getProgram(), funcNameToken);}- else {+ else if (token != null) {HighSymbol highSymbol = token.getHighSymbol(context.getHighFunction());if (highSymbol instanceof HighFunctionShellSymbol) {f = (Function) highSymbol.getSymbol().getObject();