From 3e0a54a63bf049ebe1f21a61c647bcf011b380d0 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Tue, 26 Apr 2022 16:51:42 -0400 Subject: [PATCH] GP-1965 added deleted datatype check to resolve method --- .../java/ghidra/program/database/data/DataTypeManagerDB.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java index e53a157db1..d45937c323 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java @@ -1011,9 +1011,14 @@ abstract public class DataTypeManagerDB implements DataTypeManager { return dataType; } + if (dataType.isDeleted()) { + throw new IllegalArgumentException("can't resolve deleted datatype"); + } + if (dataType instanceof BitFieldDataType) { return resolveBitFieldDataType((BitFieldDataType) dataType, handler); } + lock.acquire(); DataTypeConflictHandler originalHandler = null; boolean isEquivalenceCacheOwner = activateEquivalenceCache();