eliott/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-04-25 17:25:17 +02:00
Code Issues 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

12
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorModel.java
View File

@@ -822,11 +822,7 @@ public class FunctionEditorModel {
for (ParamInfo paramInfo : functionData.getParameters()) {
Parameter param = function.getParameter(paramInfo.getOrdinal());
if (param != null) {
if (param.getSymbol().isDeleted()) {
// concurrent removal of param - must do full update
break;
}
if (param != null && !param.isAutoParameter()) {
param.setName(paramInfo.getName(), SourceType.USER_DEFINED);
}
}
@@ -860,11 +856,7 @@ public class FunctionEditorModel {
: FunctionUpdateType.DYNAMIC_STORAGE_FORMAL_PARAMS,
true, sigSource);
}
catch (DuplicateNameException e) {
Msg.showError(this, null, "Function Edit Error", e.getMessage());
return false;
}
catch (InvalidInputException e) {
catch (Exception e) {
Msg.showError(this, null, "Function Edit Error", e.getMessage());
return false;
}