vee1e/flatbuffers
1
0
Fork 0
mirror of https://github.com/vee1e/flatbuffers.git synced 2026-09-04 19:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed padding in struct for annotated binary (#7199)

Browse source
This commit is contained in:
Derek Bailey 2022-03-30 16:43:22 -07:00 • committed by GitHub
parent b71d968fad
commit 40866a8927
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 325 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/binary_annotator.cpp
View file

@ -865,6 +865,18 @@ uint64_t BinaryAnnotator::BuildStruct(const uint64_t struct_offset,
}
}
}
// Insert any padding after this field.
const uint16_t padding = field->padding();
if (padding > 0 && IsValidOffset(offset + padding)) {
BinaryRegionComment padding_comment;
padding_comment.type = BinaryRegionCommentType::Padding;
regions.push_back(MakeBinaryRegion(offset, padding,
BinaryRegionType::Uint8, padding, 0,
padding_comment));
offset += padding;
}
});
return offset;
@ -1104,7 +1116,7 @@ void BinaryAnnotator::BuildVector(const uint64_t vector_offset,
case reflection::BaseType::Union: {
// Vector of unions
// Unions have both their realized type (uint8_t for now) that are
// stored sperately. These are stored in the field->index() - 1
// stored separately. These are stored in the field->index() - 1
// location.
const uint16_t union_type_vector_id = field->id() - 1;