yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1965_ghidra1_CheckForDeletedDataTypes'

Browse source
This commit is contained in:
ghidra1 2022-04-27 10:39:57 -04:00
commit d0a8291e93
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1011,9 +1011,14 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
return dataType; return dataType;
} }
if (dataType.isDeleted()) {
throw new IllegalArgumentException("can't resolve deleted datatype");
}
if (dataType instanceof BitFieldDataType) { if (dataType instanceof BitFieldDataType) {
return resolveBitFieldDataType((BitFieldDataType) dataType, handler); return resolveBitFieldDataType((BitFieldDataType) dataType, handler);
} }
lock.acquire(); lock.acquire();
DataTypeConflictHandler originalHandler = null; DataTypeConflictHandler originalHandler = null;
boolean isEquivalenceCacheOwner = activateEquivalenceCache(); boolean isEquivalenceCacheOwner = activateEquivalenceCache();
@ -1816,11 +1821,15 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
if (dt instanceof BadDataType) { if (dt instanceof BadDataType) {
return BAD_DATATYPE_ID; return BAD_DATATYPE_ID;
} }
if (dt instanceof DatabaseObject) { if (dt instanceof DataTypeDB) {
// NOTE: Implementation DOES NOT check or guarantee that datatype or its returned ID // NOTE: Implementation DOES NOT check or guarantee that datatype or its returned ID
// correspond to this datatype manager instance. This seems incorrect although it's // correspond to this datatype manager instance. This seems incorrect although it's
// possible that uses depend on this behavior. // possible that uses depend on this behavior.
return ((DatabaseObject) dt).getKey(); DataTypeDB dtDb = (DataTypeDB) dt;
if (dtDb.isDeleted()) {
return BAD_DATATYPE_ID;
}
return dtDb.getKey();
} }
Long l = builtIn2IdMap.get(dt); Long l = builtIn2IdMap.get(dt);
@ -2155,12 +2164,8 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
// otherwise, it probably belongs to this dataTypeManager, but it could a // otherwise, it probably belongs to this dataTypeManager, but it could a
// leftover after an undo. So make sure it really is there. // leftover after an undo. So make sure it really is there.
if (dataType instanceof DataTypeDB) { if (dataType instanceof DataTypeDB) {
long id = ((DataTypeDB) dataType).getKey(); DataTypeDB dtDb = (DataTypeDB) dataType;
// NOTE: Does not seem to help following an undo/redo return dtCache.get(dtDb.getKey()) == dataType && !dtDb.isDeleted();
// DataTypeDB existingDt = dtCache.get(id);
// return existingDt == dataType && existingDt.validate(lock);
//
return dtCache.get(id) != null;
} }
return builtIn2IdMap.containsKey(dataType); return builtIn2IdMap.containsKey(dataType);
} }