yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

GP-0 corrected latent issue in AbstractEditFunctionSignatureDialog

Browse source
This commit is contained in:
ghidra1 2022-12-01 21:05:12 -05:00
parent 703043dbf2
commit f30b37bc05
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/AbstractEditFunctionSignatureDialog.java
View file

@ -179,16 +179,12 @@ public abstract class AbstractEditFunctionSignatureDialog extends DialogComponen
mainPanel.add(buildSignaturePanel()); mainPanel.add(buildSignaturePanel());
mainPanel.add(buildAttributePanel()); mainPanel.add(buildAttributePanel());
if (allowCallFixup) { if (allowCallFixup) {
installCallFixupWidget(mainPanel); JPanel callFixupPanel = buildCallFixupPanel();
mainPanel.add(callFixupPanel != null ? callFixupPanel : buildSpacerPanel());
} }
return mainPanel; return mainPanel;
} }
private void installCallFixupWidget(JPanel parentPanel) {
JPanel callFixupPanel = buildCallFixupPanel();
parentPanel.add(callFixupPanel != null ? callFixupPanel : buildSpacerPanel());
}
private JPanel buildSignaturePanel() { private JPanel buildSignaturePanel() {
JPanel signaturePanel = new JPanel(); JPanel signaturePanel = new JPanel();
signaturePanel.setLayout(new BoxLayout(signaturePanel, BoxLayout.X_AXIS)); signaturePanel.setLayout(new BoxLayout(signaturePanel, BoxLayout.X_AXIS));
@ -252,10 +248,6 @@ public abstract class AbstractEditFunctionSignatureDialog extends DialogComponen
private JPanel buildCallFixupPanel() { private JPanel buildCallFixupPanel() {
if (allowCallFixup) {
return null;
}
JPanel callFixupPanel = new JPanel(); JPanel callFixupPanel = new JPanel();
callFixupPanel.setLayout(new BoxLayout(callFixupPanel, BoxLayout.X_AXIS)); callFixupPanel.setLayout(new BoxLayout(callFixupPanel, BoxLayout.X_AXIS));

2
Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/FunctionTestDouble.java
View file

@ -106,7 +106,7 @@ public class FunctionTestDouble implements Function {
@Override @Override
public String getCallFixup() { public String getCallFixup() {
throw new UnsupportedOperationException(); return null;
} }
@Override @Override