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

GP-1 fixed error message for merging packed structures

Browse Source
This commit is contained in:
ghidragon
2026-03-04 12:00:21 -05:00
parent fc4ea10d8d
commit b75b79b7e3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/merge/StructureMerger.java
+1 -1
View File
@@ -189,7 +189,7 @@ public class StructureMerger extends DataTypeMerger<Structure> {
DataType resultDt = workingComp.getDataType(); DataType resultDt = workingComp.getDataType();
DataType dt = comp.getDataType(); DataType dt = comp.getDataType();
if (!resultDt.equals(dt)) { if (!resultDt.equals(dt)) {
error("Packed components have conflicting datatypes at ordinal" + error("Packed components have conflicting datatypes at ordinal " +
workingComp.getOrdinal() + ", offset " + comp.getOffset()); workingComp.getOrdinal() + ", offset " + comp.getOffset());
} }
} }