Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-12-03 17:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3224_RenameFlexibility'

Browse Source 
(Closes #4863)
This commit is contained in:
Ryan Kurtz 2023-04-06 12:11:27 -04:00
commit ca9a56b5f4
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/IsolateVariableTask.java
View File

@ -76,9 +76,7 @@ public class IsolateVariableTask extends RenameTask {
}
return true;
}
LocalSymbolMap localSymbolMap = highFunction.getLocalSymbolMap();
if (localSymbolMap.containsVariableWithName(newName) ||
isSymbolInFunction(function, newName)) {
if (isSymbolInFunction(function, newName)) {
errorMsg = "Duplicate name";
return false;
}

4
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RenameVariableTask.java
View File

@ -60,9 +60,7 @@ public class RenameVariableTask extends RenameTask {
@Override
public boolean isValid(String newNm) {
newName = newNm;
LocalSymbolMap localSymbolMap = hfunction.getLocalSymbolMap();
if (localSymbolMap.containsVariableWithName(newName) ||
isSymbolInFunction(function, newName)) {
if (isSymbolInFunction(function, newName)) {
errorMsg = "Duplicate name";
return false;
}

10
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/LocalSymbolMap.java
View File

@ -425,16 +425,6 @@ public class LocalSymbolMap {
return (HighParam) paramSymbols[i].getHighVariable();
}
public boolean containsVariableWithName(String name) {
Collection<HighSymbol> values = symbolMap.values();
for (HighSymbol sym : values) {
if (sym.getName().equals(name)) {
return true;
}
}
return false;
}
protected HighSymbol newMappedSymbol(long id, String nm, DataType dt, VariableStorage store,
Address pcaddr, int slot) {
if (id == 0) {