Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-12-03 17:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-3263-dragonmacher-dt-finder-exception' (Closes #5164)
This commit is contained in:
Ryan Kurtz 2023-03-27 09:54:14 -04:00
commit a43de5bf95
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/extension/datatype/finder/DecompilerReference.java
View File

@ -156,15 +156,20 @@ public abstract class DecompilerReference {
public static DataType getFieldDataType(ClangFieldToken field) {
DataType fieldDt = field.getDataType();
fieldDt = DecompilerReference.getBaseType(fieldDt);
if (fieldDt instanceof Structure) {
Structure parent = (Structure) fieldDt;
int offset = field.getOffset();
int n = parent.getLength();
if (offset >= 0 && offset < n) {
DataTypeComponent dtc = parent.getComponentContaining(field.getOffset());
if (!(fieldDt instanceof Structure)) {
return fieldDt;
}
Structure parent = (Structure) fieldDt;
int offset = field.getOffset();
int n = parent.getLength();
if (offset >= 0 && offset < n) {
DataTypeComponent dtc = parent.getComponentContaining(field.getOffset());
if (dtc != null) {
fieldDt = dtc.getDataType();
}
}
return fieldDt;
}