Skip to content

ARROW-8225: [Rust] Continuation marker check was in wrong location. #6791

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
maxburke wants to merge 2 commits into from
Closed

ARROW-8225: [Rust] Continuation marker check was in wrong location. #6791

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9a6e9a
Continuation marker check was in wrong location.
maxburke Mar 31, 2020
3455fee
Merge branch 'master' into rust_continuation_2
maxburke Apr 2, 2020
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
19 changes: 12 additions & 7 deletions rust/arrow/src/ipc/reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,17 +727,22 @@ impl<R: Read> StreamReader<R> {
// determine metadata length
let mut meta_size: [u8; 4] = [0; 4];
reader.read_exact(&mut meta_size)?;
let meta_len = u32::from_le_bytes(meta_size);
let meta_len = {
let meta_len = u32::from_le_bytes(meta_size);

// If a continuation marker is encountered, skip over it and read
// the size from the next four bytes.
if meta_len == CONTINUATION_MARKER {
reader.read_exact(&mut meta_size)?;
u32::from_le_bytes(meta_size)
} else {
meta_len
}
};

let mut meta_buffer = vec![0; meta_len as usize];
reader.read_exact(&mut meta_buffer)?;

// If a continuation marker is encountered, skip over it and read
// the size from the next four bytes.
if u32::from_le_bytes(meta_size) == CONTINUATION_MARKER {
reader.read_exact(&mut meta_size)?;
}

let vecs = &meta_buffer.to_vec();
let message = ipc::get_root_as_message(vecs);
// message header is a Schema, so read it
Expand Down