From ed46dde304c8de479bd321b4f74f980a7ba81ada Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Tue, 12 Dec 2023 15:40:29 -0500 Subject: [PATCH] GP-0 corrected decompiler modellock --- .../java/ghidra/program/model/pcode/FunctionPrototype.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/FunctionPrototype.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/FunctionPrototype.java index a4892023b5..6785e0563e 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/FunctionPrototype.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/FunctionPrototype.java @@ -132,7 +132,8 @@ public class FunctionPrototype { protoModel = f.getProgram().getCompilerSpec().getDefaultCallingConvention(); } hasThis = protoModel.hasThisPointer(); - modellock = !f.hasUnknownCallingConventionName(); + modellock = + ((modelname != null) && !Function.UNKNOWN_CALLING_CONVENTION_STRING.equals(modelname)); injectname = f.getCallFixup(); voidinputlock = false; Parameter returnparam = f.getReturn();