Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions encodings/fastlanes/src/rle/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -339,4 +339,35 @@ mod tests {

Ok(())
}

#[test]
fn test_deserialize_rejects_non_primitive_dtype() -> VortexResult<()> {
let metadata = RLEMetadata {
values_len: 0,
indices_len: 0,
indices_ptype: PType::U16 as i32,
values_idx_offsets_len: 0,
values_idx_offsets_ptype: PType::U64 as i32,
offset: 0,
}
.encode_to_vec();
let children: Vec<ArrayRef> = Vec::new();
let result = ArrayPlugin::deserialize(
&RLE,
ArrayDeserialization::new(
VTable::id(&RLE),
&DType::Utf8(Nullability::NonNullable),
0,
&metadata,
&[],
&children,
),
&SESSION,
);
assert!(result.is_err_and(|err| {
err.to_string()
.contains("Cannot convert DType utf8 into PType")
}));
Ok(())
}
}
3 changes: 2 additions & 1 deletion encodings/fastlanes/src/rle/vtable/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,10 @@ impl ArrayPlugin for RLE {
"RLEArray expects 0 buffers, got {}",
buffers.len()
);
let values_ptype = PType::try_from(dtype)?;
let values = children.get(
0,
&DType::Primitive(dtype.as_ptype(), Nullability::NonNullable),
&DType::Primitive(values_ptype, Nullability::NonNullable),
usize::try_from(metadata.values_len)?,
)?;

Expand Down
60 changes: 60 additions & 0 deletions vortex-array/src/arrays/runend/array/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -927,4 +927,64 @@ mod tests {

Ok(())
}

// On 32-bit targets, a crafted num_runs / offset above usize::MAX used to panic via
// vortex_expect. Keep a regression that only builds where the conversion can fail.
#[cfg(target_pointer_width = "32")]
#[test]
fn test_deserialize_rejects_num_runs_overflow() -> VortexResult<()> {
let metadata = RunEndMetadata {
ends_ptype: PType::U32 as i32,
num_runs: u64::from(u32::MAX) + 1,
offset: 0,
}
.encode_to_vec();
let children: Vec<ArrayRef> = Vec::new();
let result = ArrayPlugin::deserialize(
&RunEnd,
ArrayDeserialization::new(
VTable::id(&RunEnd),
&DType::Primitive(PType::I32, Nullability::NonNullable),
0,
&metadata,
&[],
&children,
),
&SESSION,
);
assert!(result.is_err_and(|err| {
err.to_string().contains("RunEndMetadata num_runs")
&& err.to_string().contains("exceeds usize range")
}));
Ok(())
}

#[cfg(target_pointer_width = "32")]
#[test]
fn test_deserialize_rejects_offset_overflow() -> VortexResult<()> {
let metadata = RunEndMetadata {
ends_ptype: PType::U32 as i32,
num_runs: 0,
offset: u64::from(u32::MAX) + 1,
}
.encode_to_vec();
let children: Vec<ArrayRef> = Vec::new();
let result = ArrayPlugin::deserialize(
&RunEnd,
ArrayDeserialization::new(
VTable::id(&RunEnd),
&DType::Primitive(PType::I32, Nullability::NonNullable),
0,
&metadata,
&[],
&children,
),
&SESSION,
);
assert!(result.is_err_and(|err| {
err.to_string().contains("RunEndMetadata offset")
&& err.to_string().contains("exceeds usize range")
}));
Ok(())
}
}
15 changes: 13 additions & 2 deletions vortex-array/src/arrays/runend/array/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use prost::Message;
use vortex_error::VortexExpect;
use vortex_error::VortexResult;
use vortex_error::vortex_ensure_eq;
use vortex_error::vortex_err;
use vortex_session::VortexSession;

use super::RunEnd;
Expand Down Expand Up @@ -79,11 +80,21 @@ impl ArrayPlugin for RunEnd {
let metadata = RunEndMetadata::decode(metadata)?;
let ends_ptype = metadata.get_ends_ptype()?;
let ends_dtype = DType::Primitive(ends_ptype, Nullability::NonNullable);
let runs = usize::try_from(metadata.num_runs).vortex_expect("Must be a valid usize");
let runs = usize::try_from(metadata.num_runs).map_err(|_| {
vortex_err!(
"RunEndMetadata num_runs {} exceeds usize range",
metadata.num_runs
)
})?;
let ends = children.get(0, &ends_dtype, runs)?;

let values = children.get(1, dtype, runs)?;
let offset = usize::try_from(metadata.offset).vortex_expect("Offset must be a valid usize");
let offset = usize::try_from(metadata.offset).map_err(|_| {
vortex_err!(
"RunEndMetadata offset {} exceeds usize range",
metadata.offset
)
})?;
RunEndData::validate_parts(
&ends,
&values,
Expand Down
Loading