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

Merge remote-tracking branch 'origin/GP-4797_ghidra1_EnumDataType' into

Browse Source 
patch (Closes #6765)
This commit is contained in:
ghidra1
2024-07-29 17:51:20 -04:00
parent 6264a0fc94 1d641f5197
commit ae18bdb413
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/PEx64UnwindInfoDataType.java
+1 -1
View File
@@ -164,7 +164,7 @@ public class PEx64UnwindInfoDataType extends DynamicDataType {
private static EnumDataType unwindInfoFlagsEnum; private static EnumDataType unwindInfoFlagsEnum;
private EnumDataType defineUnwindInfoFlags() { private synchronized EnumDataType defineUnwindInfoFlags() {
if (unwindInfoFlagsEnum == null) { if (unwindInfoFlagsEnum == null) {
unwindInfoFlagsEnum = new EnumDataType("UNW_FLAGS", 1); unwindInfoFlagsEnum = new EnumDataType("UNW_FLAGS", 1);
unwindInfoFlagsEnum.add("UNW_FLAG_NHANDLER", PEx64UnwindInfo.UNW_FLAG_NHANDLER); unwindInfoFlagsEnum.add("UNW_FLAG_NHANDLER", PEx64UnwindInfo.UNW_FLAG_NHANDLER);
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java
+1
View File
@@ -130,6 +130,7 @@ public class EnumDataType extends GenericDataType implements Enum {
List<String> names = new ArrayList<>(); List<String> names = new ArrayList<>();
Collection<List<String>> values = valueMap.values(); Collection<List<String>> values = valueMap.values();
for (List<String> list : values) { for (List<String> list : values) {
list = new ArrayList<>(list);
Collections.sort(list); Collections.sort(list);
names.addAll(list); names.addAll(list);
} }