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

GP-1965 check for deleted datatypes

Browse source
This commit is contained in:
ghidra1 2022-04-25 20:40:28 -04:00
parent 06c8cfc24a
commit 1fd03306a5
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1816,11 +1816,15 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
if (dt instanceof BadDataType) {
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
// correspond to this datatype manager instance. This seems incorrect although it's
// 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);
@ -2155,12 +2159,8 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
// otherwise, it probably belongs to this dataTypeManager, but it could a
// leftover after an undo. So make sure it really is there.
if (dataType instanceof DataTypeDB) {
long id = ((DataTypeDB) dataType).getKey();
// NOTE: Does not seem to help following an undo/redo
// DataTypeDB existingDt = dtCache.get(id);
// return existingDt == dataType && existingDt.validate(lock);
//
return dtCache.get(id) != null;
DataTypeDB dtDb = (DataTypeDB) dataType;
return dtCache.get(dtDb.getKey()) == dataType && !dtDb.isDeleted();
}
return builtIn2IdMap.containsKey(dataType);
}