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

Merge remote-tracking branch 'origin/GP-119_FillOutStructureRedux'

Browse source
This commit is contained in:
ghidravore 2020-09-04 14:07:11 -04:00
commit 17d5a14d42
3 changed files with 85 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/MetaDataType.java
View file

@ -91,10 +91,22 @@ public enum MetaDataType {
return aCopy;
}
if (aMeta == MetaDataType.PTR) {
if (a instanceof TypeDef) {
a = ((TypeDef) a).getBaseDataType();
}
if (b instanceof TypeDef) {
b = ((TypeDef) b).getBaseDataType();
}
a = ((Pointer) a).getDataType();
b = ((Pointer) b).getDataType();
}
else if (aMeta == MetaDataType.ARRAY) {
if (a instanceof TypeDef) {
a = ((TypeDef) a).getBaseDataType();
}
if (b instanceof TypeDef) {
b = ((TypeDef) b).getBaseDataType();
}
if (!(a instanceof Array) || !(b instanceof Array)) {
break;
}

8
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/NoisyStructureBuilder.java
View file

@ -79,10 +79,16 @@ public class NoisyStructureBuilder {
* @param dt is the data-type of field if known (null otherwise)
*/
public void addDataType(long offset, DataType dt) {
if (dt == null) {
if (dt == null || dt instanceof VoidDataType) {
computeMax(offset, 1);
return;
}
if (dt instanceof Pointer && ((Pointer) dt).getDataType().equals(structDT)) {
// Be careful of taking a pointer to the structure when the structure
// is not fully defined
DataTypeManager manager = dt.getDataTypeManager();
dt = manager.getPointer(DataType.DEFAULT, dt.getLength());
}
computeMax(offset, dt.getLength());
Entry<Long, DataType> firstEntry = checkForOverlap(offset, dt.getLength());
if (firstEntry != null) {