From f6ad8045e96071077413358c5e24455f85ad85ff Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Wed, 9 Mar 2022 17:32:28 -0500 Subject: [PATCH] GP-1036 Added new data clear mode CLEAR_ALL_DEFAULT_CONFLICT_DATA for DataUtilities --- .../main/java/ghidra/program/model/data/DataUtilities.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataUtilities.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataUtilities.java index 60e229ef13..8dd8dcb73e 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataUtilities.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataUtilities.java @@ -101,6 +101,13 @@ public final class DataUtilities { if (Undefined.isUndefined(dt)) { return true; } + if (dt instanceof TypeDef) { + TypeDef td = (TypeDef) dt; + if (!td.isAutoNamed()) { + return false; + } + dt = td.getDataType(); + } if (dt instanceof Pointer) { Pointer p = (Pointer) dt; dt = p.getDataType();