GP-3454 Corrected regression in Decompiler Edit Function Signature

sakiodre · May 22, 2023 · 416a3e9 · 416a3e9
1 parent 0cae3ab
commit 416a3e9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...piler/src/main/java/ghidra/app/plugin/core/decompile/actions/SpecifyCPrototypeAction.java b/...piler/src/main/java/ghidra/app/plugin/core/decompile/actions/SpecifyCPrototypeAction.java
@@ -30,6 +30,7 @@
 import ghidra.program.model.symbol.SourceType;
 import ghidra.util.HelpLocation;
 import ghidra.util.UndefinedFunction;
+import ghidra.util.exception.InvalidInputException;
 
 public class SpecifyCPrototypeAction extends AbstractDecompilerAction {
 
@@ -117,6 +118,13 @@ private FunctionDefinitionDataType buildSignature(HighFunction hf) {
 			func.getName(), func.getProgram().getDataTypeManager());
 		FunctionPrototype functionPrototype = hf.getFunctionPrototype();
 
+		try {
+			fsig.setCallingConvention(functionPrototype.getModelName());
+		}
+		catch (InvalidInputException e) {
+			// ignore
+		}
+
 		int np = hf.getLocalSymbolMap().getNumParams();
 		fsig.setReturnType(functionPrototype.getReturnType());
 
@@ -172,7 +180,6 @@ protected void decompilerActionPerformed(DecompilerActionContext context) {
 		if (function.getEntryPoint().equals(hf.getFunction().getEntryPoint())) {
 			if (function.getSignatureSource() == SourceType.DEFAULT) {
 				model.setUseCustomizeStorage(false);
-				model.setCallingConventionName(functionPrototype.getModelName());
 				model.setFunctionData(buildSignature(hf));
 				verifyDynamicEditorModel(hf, model);
 			}