Skip to content

Validate segment offsets when populating initial segments #8827

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

Closed
robert3005 wants to merge 1 commit into from
Closed

Validate segment offsets when populating initial segments #8827

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
20 changes: 14 additions & 6 deletions vortex-file/src/open.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use vortex_buffer::ByteBuffer;
use vortex_error::VortexError;
use vortex_error::VortexExpect;
use vortex_error::VortexResult;
use vortex_error::vortex_err;
use vortex_io::VortexReadAt;
use vortex_io::session::RuntimeSessionExt;
use vortex_layout::segments::InstrumentedSegmentCache;
Expand Down Expand Up @@ -326,7 +327,7 @@ impl VortexOpenOptions {
// If the initial read happened to cover any segments, then we can populate the
// segment cache
let initial_offset = file_size - (deserializer.buffer().len() as u64);
self.populate_initial_segments(initial_offset, deserializer.buffer(), &footer);
self.populate_initial_segments(initial_offset, deserializer.buffer(), &footer)?;

Ok(footer)
}
Expand All @@ -337,7 +338,7 @@ impl VortexOpenOptions {
initial_offset: u64,
initial_read: &ByteBuffer,
footer: &Footer,
) {
) -> VortexResult<()> {
let first_idx = footer
.segment_map()
.partition_point(|segment| segment.offset < initial_offset);
Expand All @@ -349,12 +350,19 @@ impl VortexOpenOptions {
let segment_id =
SegmentId::from(u32::try_from(idx).vortex_expect("Invalid segment ID"));
let offset =
usize::try_from(segment.offset - initial_offset).vortex_expect("Invalid offset");
let buffer = initial_read
.slice(offset..offset + (segment.length as usize))
.aligned(segment.alignment);
usize::try_from(segment.offset.checked_sub(initial_offset).ok_or_else(|| {
vortex_err!(
"Segment offset {} is smaller than file read offset {initial_offset}",
segment.offset
)
})?)?;
let buffer = offset
.checked_add(segment.length as usize)
.map(|end| initial_read.slice(offset..end).aligned(segment.alignment))
.ok_or_else(|| vortex_err!("Segment length exceeds usize {}", segment.length))?;
initial_read_segments.insert(segment_id, buffer);
}
Ok(())
}
}

Expand Down
Loading