yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4682_ghidra1_eBPFAnalysis--SQUASHED'

Browse source
This commit is contained in:
Ryan Kurtz 2024-06-24 13:50:03 -04:00
commit 21a3896018
8 changed files with 558 additions and 1183 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java
View file

@ -1243,7 +1243,8 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
sourceArchive.getArchiveType() == ArchiveType.BUILT_IN) {
resolvedDataType = resolveBuiltIn(dataType);
}
else if (sourceArchive == null || dataType.getUniversalID() == null) {
else if (sourceArchive == null || dataType.getUniversalID() == null ||
sourceArchive.getArchiveType() == ArchiveType.TEMPORARY) {
// if the dataType has no source or it has no ID (datatypes with no ID are
// always local i.e. pointers)
resolvedDataType = resolveDataTypeNoSource(dataType);

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ArchiveType.java
View file

@ -21,7 +21,7 @@ public enum ArchiveType {
FILE,
PROJECT,
PROGRAM,
TEST;
TEMPORARY;
//@formatter:on
public boolean isBuiltIn() {

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StandAloneDataTypeManager.java
View file

@ -923,7 +923,7 @@ public class StandAloneDataTypeManager extends DataTypeManagerDB implements Clos
@Override
public ArchiveType getType() {
return ArchiveType.TEST;
return ArchiveType.TEMPORARY;
}
/**