yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

GP-0 Corrected test failure fallout from GP-4682 datatype resolution

Browse source 
change related to temporary source archive
This commit is contained in:
ghidra1 2024-06-25 13:21:27 -04:00
parent b86ad84c04
commit 3b6d5e43ce
6 changed files with 44 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1243,15 +1243,15 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
sourceArchive.getArchiveType() == ArchiveType.BUILT_IN) {
resolvedDataType = resolveBuiltIn(dataType);
}
else if (sourceArchive == null || dataType.getUniversalID() == null ||
sourceArchive.getArchiveType() == ArchiveType.TEMPORARY) {
else if (sourceArchive == null || dataType.getUniversalID() == null) {
// if the dataType has no source or it has no ID (datatypes with no ID are
// always local i.e. pointers)
resolvedDataType = resolveDataTypeNoSource(dataType);
}
else if (!sourceArchive.getSourceArchiveID().equals(getUniversalID()) &&
sourceArchive.getArchiveType() == ArchiveType.PROGRAM) {
// dataTypes from a different program don't carry over their identity.
(sourceArchive.getArchiveType() == ArchiveType.PROGRAM ||
sourceArchive.getArchiveType() == ArchiveType.TEMPORARY)) {
// dataTypes from a program or temporary archive don't carry over their identity
resolvedDataType = resolveDataTypeNoSource(dataType);
}
else {