Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-1 Always use BadDataType.datatype instance

ghidra18938cc34786e
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 2bcc471309..28cb21906c 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
@@ -158,7 +158,6 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
private LinkedList<Long> idsToDelete = new LinkedList<>();
private LinkedList<Pair<DataType, DataType>> typesToReplace = new LinkedList<>();
private List<DataType> favoritesList = new ArrayList<>();
- private BadDataType myBadDataType = new BadDataType(this);
/**
* Set of {@link AbstractIntegerDataType} IDs whose removal has been blocked
@@ -1242,7 +1241,7 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
if (dataType instanceof BadDataType) {
// Avoid adding BAD data type to the manager which
// will appear when needed for a missing datatype
- return myBadDataType;
+ return BadDataType.dataType;
}
if (dataType instanceof BitFieldDataType) {
@@ -2301,7 +2300,7 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
return DataType.DEFAULT;
}
if (dataTypeID == BAD_DATATYPE_ID) {
- return myBadDataType;
+ return BadDataType.dataType;
}
return getDataType(dataTypeID, null);
}
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BadDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BadDataType.java
index fa59a9d581..acb0f74646 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BadDataType.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BadDataType.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,26 +17,23 @@ package ghidra.program.model.data;
import ghidra.docking.settings.Settings;
import ghidra.program.model.mem.MemBuffer;
-import ghidra.util.classfinder.ClassSearcher;
/**
* Provides an implementation of a data type that is not valid (bad) as it is used in
* the program. For example, the class for the underlying data type may no longer be
* available or the data type may not fit where it has been placed in the program.
- * <P>
- * This field is not meant to be loaded by the {@link ClassSearcher}, hence the X in the name.
*/
public class BadDataType extends BuiltIn implements Dynamic {
- private final static long serialVersionUID = 1;
public static final BadDataType dataType = new BadDataType();
- public BadDataType() {
- this(null);
+ private BadDataType() {
+ super(CategoryPath.ROOT, "-BAD-", null);
}
- public BadDataType(DataTypeManager dtm) {
- super(null, "-BAD-", dtm);
+ @Override
+ public DataType clone(DataTypeManager dtm) {
+ return this;
}
/**
@@ -89,14 +86,6 @@ public class BadDataType extends BuiltIn implements Dynamic {
return getDescription();
}
- @Override
- public DataType clone(DataTypeManager dtm) {
- if (dtm == getDataTypeManager()) {
- return this;
- }
- return new BadDataType(dtm);
- }
-
@Override
public boolean canSpecifyLength() {
return true;