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

Changed handling of reheritaged memory locations

Browse source
This commit is contained in:
caheckman 2020-10-15 17:14:12 -04:00
parent 7e53da0aed
commit 96910671b0
7 changed files with 93 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/Decompiler/src/decompile/cpp/varmap.cc
View file

@ -289,7 +289,6 @@ void ScopeLocal::collectNameRecs(void)
while(iter!=nametree.end()) {
Symbol *sym = *iter++;
if (sym->isNameLocked()&&(!sym->isTypeLocked())) {
addRecommendName(sym);
if (sym->isThisPointer()) { // If there is a "this" pointer
Datatype *dt = sym->getType();
if (dt->getMetatype() == TYPE_PTR) {
@ -301,6 +300,7 @@ void ScopeLocal::collectNameRecs(void)
}
}
}
addRecommendName(sym); // This deletes the symbol
}
}
}
@ -1209,8 +1209,12 @@ SymbolEntry *ScopeLocal::remapSymbol(Symbol *sym,const Address &addr,const Addre
SymbolEntry *entry = sym->getFirstWholeMap();
int4 size = entry->getSize();
if (!entry->isDynamic()) {
if (entry->getAddr() == addr && entry->getFirstUseAddress() == usepoint)
return entry;
if (entry->getAddr() == addr) {
if (usepoint.isInvalid() && entry->getFirstUseAddress().isInvalid())
return entry;
if (entry->getFirstUseAddress() == usepoint)
return entry;
}
}
removeSymbolMappings(sym);
RangeList rnglist;