Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 09:34:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1-dragonmacher-html-bug-fix'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-02-02 11:00:14 -05:00
parent 24e128b277 9db6c7c886
commit 295eb29195
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.java
+4 -4
View File
@@ -33,7 +33,7 @@ import ghidra.util.exception.*;
public class FunctionEditorModel { public class FunctionEditorModel {
public static final String PARSING_MODE_STATUS_TEXT = public static final String PARSING_MODE_STATUS_TEXT =
"<TAB> or <RETURN> to commit edits, <ESC> to abort"; HTMLUtilities.escapeHTML("<TAB> or <RETURN> to commit edits, <ESC> to abort");
static final String NONE_CHOICE = "-NONE-"; static final String NONE_CHOICE = "-NONE-";
private String name; private String name;
@@ -641,9 +641,9 @@ public class FunctionEditorModel {
returnInfo.getFormalDataType(), storage); returnInfo.getFormalDataType(), storage);
try { try {
if (autoParamCount < oldAutoCount) { if (autoParamCount < oldAutoCount) {
if (oldParams.get( if (oldParams.get(autoParamCount)
autoParamCount).getStorage().getAutoParameterType() != storage .getStorage()
.getAutoParameterType()) { .getAutoParameterType() != storage.getAutoParameterType()) {
adjustSelectionForRowRemoved(i); adjustSelectionForRowRemoved(i);
} }
} }