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

GP-3224 Remove full symbol check from Rename actions

Browse source
This commit is contained in:
caheckman 2023-03-21 13:02:22 -04:00
parent cc35d57933
commit 79e5465160
3 changed files with 2 additions and 16 deletions
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; return true;
} }
LocalSymbolMap localSymbolMap = highFunction.getLocalSymbolMap(); if (isSymbolInFunction(function, newName)) {
if (localSymbolMap.containsVariableWithName(newName) ||
isSymbolInFunction(function, newName)) {
errorMsg = "Duplicate name"; errorMsg = "Duplicate name";
return false; 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 @Override
public boolean isValid(String newNm) { public boolean isValid(String newNm) {
newName = newNm; newName = newNm;
LocalSymbolMap localSymbolMap = hfunction.getLocalSymbolMap(); if (isSymbolInFunction(function, newName)) {
if (localSymbolMap.containsVariableWithName(newName) ||
isSymbolInFunction(function, newName)) {
errorMsg = "Duplicate name"; errorMsg = "Duplicate name";
return false; 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(); 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, protected HighSymbol newMappedSymbol(long id, String nm, DataType dt, VariableStorage store,
Address pcaddr, int slot) { Address pcaddr, int slot) {
if (id == 0) { if (id == 0) {