diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CharsetInfo.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CharsetInfo.java index 9ca02cf760..4ba8d79686 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CharsetInfo.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CharsetInfo.java @@ -15,10 +15,11 @@ */ package ghidra.program.model.data; +import java.util.*; + import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; -import java.util.*; import org.jdom.*; import org.jdom.input.SAXBuilder; @@ -97,15 +98,17 @@ public class CharsetInfo { * Application initialization overhead. */ private void registerStandardCharsets() { - addCharset(USASCII, 1); - addCharset(UTF8, 1); - addCharset("ISO-8859-1", 1); - addCharset(UTF16, 2); - addCharset("UTF-16BE", 2); - addCharset("UTF-16LE", 2); - addCharset(UTF32, 4); - addCharset("UTF-32BE", 4); - addCharset("UTF-32LE", 4); + if (charsetInfoRecsByName.isEmpty()) { + addCharset(USASCII, 1); + addCharset(UTF8, 1); + addCharset("ISO-8859-1", 1); + addCharset(UTF16, 2); + addCharset("UTF-16BE", 2); + addCharset("UTF-16LE", 2); + addCharset(UTF32, 4); + addCharset("UTF-32BE", 4); + addCharset("UTF-32LE", 4); + } } private void addCharset(String name, int charSize) {