Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-28 23:55:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2782_dev747368_fix_charset_duplicate'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-11-03 11:09:04 -04:00
parent 29d171aad8 824ba5fbaf
commit f7676cd523
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CharsetInfo.java
+13 -10
View File
@@ -15,10 +15,11 @@
*/ */
package ghidra.program.model.data; package ghidra.program.model.data;
import java.util.*;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.*;
import org.jdom.*; import org.jdom.*;
import org.jdom.input.SAXBuilder; import org.jdom.input.SAXBuilder;
@@ -97,15 +98,17 @@ public class CharsetInfo {
* Application initialization overhead. * Application initialization overhead.
*/ */
private void registerStandardCharsets() { private void registerStandardCharsets() {
addCharset(USASCII, 1); if (charsetInfoRecsByName.isEmpty()) {
addCharset(UTF8, 1); addCharset(USASCII, 1);
addCharset("ISO-8859-1", 1); addCharset(UTF8, 1);
addCharset(UTF16, 2); addCharset("ISO-8859-1", 1);
addCharset("UTF-16BE", 2); addCharset(UTF16, 2);
addCharset("UTF-16LE", 2); addCharset("UTF-16BE", 2);
addCharset(UTF32, 4); addCharset("UTF-16LE", 2);
addCharset("UTF-32BE", 4); addCharset(UTF32, 4);
addCharset("UTF-32LE", 4); addCharset("UTF-32BE", 4);
addCharset("UTF-32LE", 4);
}
} }
private void addCharset(String name, int charSize) { private void addCharset(String name, int charSize) {