mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-11-30-21'

Browse Source
This commit is contained in:
Ryan Kurtz
2021-11-30 18:34:31 -05:00
parent 193fc5d0fb fb998226ed
commit 8d293fbd32
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/locationreferences/LocationReferencesPlugin.java
View File

@@ -293,20 +293,7 @@ public class LocationReferencesPlugin extends Plugin
@Override @Override
public void findAndDisplayAppliedDataTypeAddresses(DataType dataType) { public void findAndDisplayAppliedDataTypeAddresses(DataType dataType) {
ProgramManager programManagerService = tool.getService(ProgramManager.class); findAndDisplayAppliedDataTypeAddresses(dataType, null);
GoToService goToService = tool.getService(GoToService.class);
Program program = programManagerService.getCurrentProgram();
if (program == null) {
Msg.showInfo(this, null, "Find References To...",
"You must have a program open in order to use the 'Find References To...' action");
return; // cannot find references to a data type if there is no open program
}
ProgramLocation genericLocation = new GenericDataTypeProgramLocation(program, dataType);
LocationDescriptor locationDescriptor = getLocationDescriptor(genericLocation);
Navigatable navigatable = goToService.getDefaultNavigatable();
LocationReferencesProvider provider = findProvider(locationDescriptor, navigatable);
showProvider(program, provider, locationDescriptor, navigatable);
} }
@Override @Override
@@ -320,8 +307,15 @@ public class LocationReferencesPlugin extends Plugin
return; // cannot find references to a data type if there is no open program return; // cannot find references to a data type if there is no open program
} }
ProgramLocation genericLocation = ProgramLocation genericLocation;
new GenericCompositeDataTypeProgramLocation(program, dataType, fieldName); if (fieldName != null) {
genericLocation =
new GenericCompositeDataTypeProgramLocation(program, dataType, fieldName);
}
else {
genericLocation = new GenericDataTypeProgramLocation(program, dataType);
}
LocationDescriptor locationDescriptor = getLocationDescriptor(genericLocation); LocationDescriptor locationDescriptor = getLocationDescriptor(genericLocation);
Navigatable navigatable = goToService.getDefaultNavigatable(); Navigatable navigatable = goToService.getDefaultNavigatable();
LocationReferencesProvider provider = findProvider(locationDescriptor, navigatable); LocationReferencesProvider provider = findProvider(locationDescriptor, navigatable);