Ghidra is a software reverse engineering (SRE) framework
Fix for function signature dialog parsing of custom calling conventions
dragonmacher46c957678875
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorDialog.javaindex a1425f055c..b50fde9db8 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorDialog.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorDialog.java@@ -741,11 +741,11 @@ public class FunctionEditorDialog extends DialogComponentProvider implements Mod}else {glassPane.setVisible(false);+ updateStatusText();updateNameField();updateCallingConventionCombo();updatePreviewField();updageVarArgs();- updateStatusText();updateInLineCheckbox();updateNoReturnCheckbox();updateCallFixupCombo();@@ -888,7 +888,8 @@ public class FunctionEditorDialog extends DialogComponentProvider implements Modprivate void updateStatusText() {MessageType messageType = model.isValid() ? MessageType.WARNING : MessageType.ERROR;messageType = model.isInParsingMode() ? MessageType.INFO : messageType;- setStatusText(model.getStatusText(), messageType);+ String text = model.getStatusText();+ setStatusText(text, messageType);}private void updageVarArgs() {diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.javaindex 5e9b2bc8f9..dcd9ff010b 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.java@@ -890,7 +890,8 @@ public class FunctionEditorModel {}private FunctionSignature getFunctionSignature() {- FunctionDefinitionDataType funDt = new FunctionDefinitionDataType(getName());+ ProgramBasedDataTypeManager dtm = program.getDataTypeManager();+ FunctionDefinitionDataType funDt = new FunctionDefinitionDataType(getName(), dtm);funDt.setReturnType(getFormalReturnType());String ccName = getCallingConventionName();