mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4187_dev747368_fix_golang_slice_packing'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-01-03 11:54:02 -05:00
parent e66e72577d c0c37d14d1
commit 1ea27e668e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/types/GoSliceType.java
View File

@@ -52,9 +52,17 @@ public class GoSliceType extends GoType {
@Override
public DataType recoverDataType() throws IOException {
Structure genericSliceDT = programContext.getGenericSliceDT();
StructureDataType sliceDT =
new StructureDataType(programContext.getRecoveredTypesCp(getPackagePathString()),
getUniqueTypename(), 0, programContext.getDTM());
getUniqueTypename(), genericSliceDT.getLength(), programContext.getDTM());
// ensure the sliceDT is filled out before getting the element's data type to ensure
// any other data types pulled in that ref this slice don't change size when trying to
// enable packing
sliceDT.replaceWith(genericSliceDT);
programContext.cacheRecoveredDataType(this, sliceDT);
// fixup the generic void* field with the specific element* type
@@ -62,9 +70,6 @@ public class GoSliceType extends GoType {
DataType elementDT = programContext.getRecoveredType(elementType);
Pointer elementPtrDT = programContext.getDTM().getPointer(elementDT);
Structure genericSliceDT = programContext.getGenericSliceDT();
sliceDT.replaceWith(genericSliceDT);
int arrayPtrComponentIndex = 0; /* HACK, field ordinal of void* data field in slice type */
DataTypeComponent arrayDTC = genericSliceDT.getComponent(arrayPtrComponentIndex);
sliceDT.replace(arrayPtrComponentIndex, elementPtrDT, -1, arrayDTC.getFieldName(),