yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2022-04-14 15:07:28 -04:00
commit c7351125e5
6 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapterV5V6.java
View file

@ -113,7 +113,7 @@ class CompositeDBAdapterV5V6 extends CompositeDBAdapter {
if (compositeTable.getSchema().getVersion() == V5_VERSION) {
throw new UnsupportedOperationException();
}
if (packValue < CompositeInternal.DEFAULT_ALIGNMENT) {
if (packValue < CompositeInternal.DEFAULT_PACKING) {
packValue = CompositeInternal.NO_PACKING;
}
else {

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CompositeDataTypeImpl.java
View file

@ -28,12 +28,6 @@ import ghidra.util.exception.NotYetImplementedException;
*/
public abstract class CompositeDataTypeImpl extends GenericDataType implements CompositeInternal {
// Strings used for toString formatting
private static final String ALIGN_NAME = "aligned";
private static final String PACKING_NAME = "pack";
private static final String DISABLED_PACKING_NAME = "disabled";
private static final String DEFAULT_PACKING_NAME = "";
private String description;
protected int minimumAlignment = DEFAULT_ALIGNMENT;