From 394103e3c324af44b4bc210c0c4c3ce87e7ed0e5 Mon Sep 17 00:00:00 2001 From: caheckman <48068198+caheckman@users.noreply.github.com> Date: Tue, 19 Oct 2021 13:00:22 -0400 Subject: [PATCH 1/2] Fix NPE in SpecExtensionPanel --- .../ghidra/app/plugin/processors/sleigh/SpecExtensionPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SpecExtensionPanel.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SpecExtensionPanel.java index 94a5713dd7..ed455d65e7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SpecExtensionPanel.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SpecExtensionPanel.java @@ -323,7 +323,7 @@ public class SpecExtensionPanel extends JPanel { if (injectLibrary.isOverride(fixupName, InjectPayload.CALLOTHERFIXUP_TYPE)) { status = Status.EXTENSION_OVERRIDE; } - if (injectLibrary.getPayload(InjectPayload.CALLFIXUP_TYPE, fixupName) + if (injectLibrary.getPayload(InjectPayload.CALLOTHERFIXUP_TYPE, fixupName) .isErrorPlaceholder()) { status = Status.EXTENSION_ERROR; } From c9121fe49877f14f22ee66bb01d6693ecee44d55 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Tue, 19 Oct 2021 14:10:17 -0400 Subject: [PATCH 2/2] GP-1415 corrected NPE in CreatethunkFunctionCmd --- .../java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java index ef3430330a..130da02064 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java @@ -796,6 +796,9 @@ public class CreateThunkFunctionCmd extends BackgroundCommand { } // check the parent varnode Register register = program.getRegister(regVarnode); + if (register == null) { + return false; + } Register parentRegister = register.getParentRegister(); if (parentRegister == null) { return false;