Skip to content

Api: Harden Variant Reading #16335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
steveloughran wants to merge 1 commit into
base: main
Choose a base branch
from
+66 −8
Draft

Api: Harden Variant Reading #16335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion api/src/main/java/org/apache/iceberg/variants/SerializedArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,25 @@ private SerializedArray(VariantMetadata metadata, ByteBuffer value, int header)
this.value = value;
this.offsetSize = 1 + ((header & OFFSET_SIZE_MASK) >> OFFSET_SIZE_SHIFT);
int numElementsSize = ((header & IS_LARGE) == IS_LARGE) ? 4 : 1;
int remaining = value.remaining();
Preconditions.checkArgument(
HEADER_SIZE + numElementsSize <= remaining,
"Variant array truncated: cannot read element count (numElementsSize=%s remaining=%s)",
numElementsSize,
remaining);
int numElements = VariantUtil.readLittleEndianUnsigned(value, HEADER_SIZE, numElementsSize);
Preconditions.checkArgument(
numElements >= 0, "Invalid variant array element count: %s", numElements);
this.offsetListOffset = HEADER_SIZE + numElementsSize;
this.dataOffset = offsetListOffset + ((1 + numElements) * offsetSize);
long offsetTableBytes = (1L + numElements) * offsetSize;
long computedDataOffset = (long) offsetListOffset + offsetTableBytes;
Preconditions.checkArgument(
computedDataOffset <= remaining,
"Variant array offset table extends past buffer: numElements=%s offsetSize=%s remaining=%s",
numElements,
offsetSize,
remaining);
this.dataOffset = (int) computedDataOffset;
this.array = new VariantValue[numElements];
}

Expand Down
33 changes: 28 additions & 5 deletions api/src/main/java/org/apache/iceberg/variants/SerializedMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,38 @@ static SerializedMetadata from(ByteBuffer metadata) {
private SerializedMetadata(ByteBuffer metadata, int header) {
this.isSorted = (header & SORTED_STRINGS) == SORTED_STRINGS;
this.offsetSize = 1 + ((header & OFFSET_SIZE_MASK) >> OFFSET_SIZE_SHIFT);
int remaining = metadata.remaining();
Preconditions.checkArgument(
HEADER_SIZE + offsetSize <= remaining,
"Variant metadata truncated: cannot read dictionary size (offsetSize=%s remaining=%s)",
offsetSize,
remaining);
int dictSize = VariantUtil.readLittleEndianUnsigned(metadata, HEADER_SIZE, offsetSize);
this.dict = new String[dictSize];
Preconditions.checkArgument(
dictSize >= 0, "Invalid variant metadata dictionary size: %s", dictSize);
this.offsetListOffset = HEADER_SIZE + offsetSize;
this.dataOffset = offsetListOffset + ((1 + dictSize) * offsetSize);
int endOffset =
dataOffset
// Use long arithmetic so a malformed dictSize/offsetSize cannot overflow into a small int.
long offsetTableBytes = (1L + dictSize) * offsetSize;
long computedDataOffset = (long) offsetListOffset + offsetTableBytes;
Preconditions.checkArgument(
computedDataOffset <= remaining,
"Variant metadata offset table extends past buffer: dictSize=%s offsetSize=%s remaining=%s",
dictSize,
offsetSize,
remaining);
long computedEnd =
computedDataOffset
+ VariantUtil.readLittleEndianUnsigned(
metadata, offsetListOffset + (offsetSize * dictSize), offsetSize);
if (endOffset < metadata.limit()) {
Preconditions.checkArgument(
computedEnd <= remaining,
"Variant metadata data section extends past buffer: end=%s remaining=%s",
computedEnd,
remaining);
this.dict = new String[dictSize];
this.dataOffset = (int) computedDataOffset;
int endOffset = (int) computedEnd;
if (endOffset < remaining) {
this.metadata = VariantUtil.slice(metadata, 0, endOffset);
} else {
this.metadata = metadata;
Expand Down
23 changes: 21 additions & 2 deletions api/src/main/java/org/apache/iceberg/variants/SerializedObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,32 @@ private SerializedObject(VariantMetadata metadata, ByteBuffer value, int header)
this.offsetSize = 1 + ((header & OFFSET_SIZE_MASK) >> OFFSET_SIZE_SHIFT);
this.fieldIdSize = 1 + ((header & FIELD_ID_SIZE_MASK) >> FIELD_ID_SIZE_SHIFT);
int numElementsSize = ((header & IS_LARGE) == IS_LARGE) ? 4 : 1;
int remaining = value.remaining();
Preconditions.checkArgument(
HEADER_SIZE + numElementsSize <= remaining,
"Variant object truncated: cannot read element count (numElementsSize=%s remaining=%s)",
numElementsSize,
remaining);
int numElements = VariantUtil.readLittleEndianUnsigned(value, HEADER_SIZE, numElementsSize);
Preconditions.checkArgument(
numElements >= 0, "Invalid variant object element count: %s", numElements);
this.fieldIdListOffset = HEADER_SIZE + numElementsSize;
long fieldIdBytes = (long) numElements * fieldIdSize;
long offsetTableBytes = (1L + numElements) * offsetSize;
long computedOffsetListOffset = (long) fieldIdListOffset + fieldIdBytes;
long computedDataOffset = computedOffsetListOffset + offsetTableBytes;
Preconditions.checkArgument(
computedDataOffset <= remaining,
"Variant object tables extend past buffer: numElements=%s fieldIdSize=%s offsetSize=%s remaining=%s",
numElements,
fieldIdSize,
offsetSize,
remaining);
this.fieldIds = new Integer[numElements];
this.offsetListOffset = fieldIdListOffset + (numElements * fieldIdSize);
this.offsetListOffset = (int) computedOffsetListOffset;
this.offsets = new int[numElements];
this.lengths = new int[numElements];
this.dataOffset = offsetListOffset + ((1 + numElements) * offsetSize);
this.dataOffset = (int) computedDataOffset;
this.values = new VariantValue[numElements];

if (numElements > 0) {
Expand Down
Loading