yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues 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
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) { public static DataType getFieldDataType(ClangFieldToken field) {
DataType fieldDt = field.getDataType(); DataType fieldDt = field.getDataType();
fieldDt = DecompilerReference.getBaseType(fieldDt); fieldDt = DecompilerReference.getBaseType(fieldDt);
if (fieldDt instanceof Structure) { if (!(fieldDt instanceof Structure)) {
Structure parent = (Structure) fieldDt; return fieldDt;
int offset = field.getOffset(); }
int n = parent.getLength();
if (offset >= 0 && offset < n) { Structure parent = (Structure) fieldDt;
DataTypeComponent dtc = parent.getComponentContaining(field.getOffset()); 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(); fieldDt = dtc.getDataType();
} }
} }
return fieldDt; return fieldDt;
} }