github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-07 21:24:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1-dragonmacher-reference-manager-fix'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-12-15 07:46:40 -05:00
parent 5760db4a30 2afccb1b34
commit f4491209ae
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java
View File

@@ -851,7 +851,7 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
@Override
public Reference[] getFlowReferencesFrom(Address addr) {
Reference[] refs = getReferencesFrom(addr);
ArrayList<Reference> list = new ArrayList<>(refs.length);
List<Reference> list = new ArrayList<>(refs.length);
for (Reference ref : refs) {
if (ref.getReferenceType().isFlow()) {
list.add(ref);
@@ -932,7 +932,7 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
if (fromRefs == null) {
return NO_REFS;
}
ArrayList<Reference> list = new ArrayList<>(10);
List<Reference> list = new ArrayList<>(10);
ReferenceIterator it = fromRefs.getRefs();
while (it.hasNext()) {
Reference ref = it.next();
@@ -1216,7 +1216,7 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
Address refAddr = symbol.getAddress();
ReferenceIterator iter = getReferencesTo(refAddr);
ArrayList<Reference> list = new ArrayList<>();
List<Reference> list = new ArrayList<>();
while (iter.hasNext()) {
Reference ref = iter.next();
if (symID == ref.getSymbolID()) {
@@ -2028,15 +2028,13 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
synchronized void clearCache() {
cachedFunction = null;
references = null;
variablesByAddress = null;
}
synchronized SortedMap<Address, List<Reference>> getFunctionDataReferences() {
if (references != null) {
return references;
if (references == null) {
references = getSortedVariableReferences(cachedFunction);
}
references = getSortedVariableReferences(cachedFunction);
return references;
}
@@ -2050,9 +2048,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
LazyMap.lazyMap(new HashMap<>(), () -> new ArrayList<>());
for (Symbol s : symbolMgr.getSymbols(cachedFunction.getID())) {
if (!s.getAddress().equals(address)) {
continue;
}
Variable v = (Variable) s.getObject();
map.get(address).add(v);
}
@@ -2068,8 +2063,8 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
ReferenceIterator refIter = new FromRefIterator(function.getBody());
while (refIter.hasNext()) {
Reference ref = refIter.next();
RefType referenceType = ref.getReferenceType();
if (referenceType.isFlow() && !referenceType.isIndirect()) {
RefType type = ref.getReferenceType();
if (type.isFlow() && !type.isIndirect()) {
continue;
}