MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghidra: fix implicit static array lengths assuming enum values are explicitly specified

develop
Ben Lubar 2020-03-21 19:57:33 -05:00
parent 97916fd55e
commit 4e4496a7a1
No known key found for this signature in database
GPG Key ID: 92939677AB59EDA4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reversing/import_df_structures.java
Unescape Escape View File

@ -122,6 +122,7 @@ public class import_df_structures extends GhidraScript
nodeBase.add(dtm.getPointer(node, currentProgram.getDefaultPointerSize()), "_M_parent", null); nodeBase.add(dtm.getPointer(node, currentProgram.getDefaultPointerSize()), "_M_parent", null);
nodeBase.add(dtm.getPointer(node, currentProgram.getDefaultPointerSize()), "_M_left", null); nodeBase.add(dtm.getPointer(node, currentProgram.getDefaultPointerSize()), "_M_left", null);
nodeBase.add(dtm.getPointer(node, currentProgram.getDefaultPointerSize()), "_M_right", null); nodeBase.add(dtm.getPointer(node, currentProgram.getDefaultPointerSize()), "_M_right", null);
node.add(nodeBase, "_M_base", null);
set.add(nodeBase, "_M_header", null); set.add(nodeBase, "_M_header", null);
} }
@ -138,7 +139,6 @@ public class import_df_structures extends GhidraScript
set.add(dtm.getPointer(node, currentProgram.getDefaultPointerSize()), "_Myhead", null); set.add(dtm.getPointer(node, currentProgram.getDefaultPointerSize()), "_Myhead", null);
} }
node.add(nodeBase, "_M_base", null);
node.add(target, "_M_value_field", null); node.add(target, "_M_value_field", null);
set.add(dtSizeT, "_M_node_count", null); set.add(dtSizeT, "_M_node_count", null);
@ -1126,7 +1126,7 @@ public class import_df_structures extends GhidraScript
if (f.hasCount) if (f.hasCount)
return new ArrayDataType(getDataType(f.item), f.count, 0); return new ArrayDataType(getDataType(f.item), f.count, 0);
var enumItems = codegen.typesByName.get(f.indexEnum).enumItems; var enumItems = codegen.typesByName.get(f.indexEnum).enumItems;
return new ArrayDataType(getDataType(f.item), (int)enumItems.get(enumItems.size() - 1).value + 1, 0); return new ArrayDataType(getDataType(f.item), enumItems.size() + (int)enumItems.get(0).value, 0);
case "bytes": case "bytes":
switch (f.subtype) switch (f.subtype)
{ {