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

GT-3446 - Review fixes

Browse source
This commit is contained in:
dragonmacher 2020-01-10 18:52:47 -05:00
parent 142ed19e84
commit 8ebfd61348
5 changed files with 13 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataUtilities.java
View file

@ -326,20 +326,13 @@ public final class DataUtilities {
Address addr = loc.getAddress();
Listing listing = loc.getProgram().getListing();
CodeUnit cu = listing.getCodeUnitAt(addr);
if (cu == null) {
cu = listing.getCodeUnitContaining(addr);
Data dataContaining = listing.getDataContaining(addr);
if (dataContaining == null) {
return null;
}
if (cu instanceof Data) {
Data d = (Data) cu;
int[] compPath = loc.getComponentPath();
if (compPath != null) {
d = d.getComponent(compPath);
}
return d;
}
return null;
Data dataAtAddr = dataContaining.getComponent(loc.getComponentPath());
return dataAtAddr;
}
/**