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

Merge remote-tracking branch 'origin/patch' into Ghidra_12.1

Browse Source
This commit is contained in:
ghidra1
2026-04-22 11:25:17 -04:00
parent 293444d396 027521316f
commit 829ee7cce4
1 changed files with 2 additions and 10 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
+2 -10
View File
@@ -822,11 +822,7 @@ public class FunctionEditorModel {
for (ParamInfo paramInfo : functionData.getParameters()) { for (ParamInfo paramInfo : functionData.getParameters()) {
Parameter param = function.getParameter(paramInfo.getOrdinal()); Parameter param = function.getParameter(paramInfo.getOrdinal());
if (param != null) { if (param != null && !param.isAutoParameter()) {
if (param.getSymbol().isDeleted()) {
// concurrent removal of param - must do full update
break;
}
param.setName(paramInfo.getName(), SourceType.USER_DEFINED); param.setName(paramInfo.getName(), SourceType.USER_DEFINED);
} }
} }
@@ -860,11 +856,7 @@ public class FunctionEditorModel {
: FunctionUpdateType.DYNAMIC_STORAGE_FORMAL_PARAMS, : FunctionUpdateType.DYNAMIC_STORAGE_FORMAL_PARAMS,
true, sigSource); true, sigSource);
} }
catch (DuplicateNameException e) { catch (Exception e) {
Msg.showError(this, null, "Function Edit Error", e.getMessage());
return false;
}
catch (InvalidInputException e) {
Msg.showError(this, null, "Function Edit Error", e.getMessage()); Msg.showError(this, null, "Function Edit Error", e.getMessage());
return false; return false;
} }