Skip to content
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

Fix invalid write to uninitialized Vec #5396

Merged
merged 3 commits into from
May 15, 2024
Merged

Fix invalid write to uninitialized Vec #5396

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2737b0d
Fix invalid write to uninitialized Vec
rbran May 10, 2024
efbcaec
Fix invalid write to uninitialized reserved Vec
rbran May 10, 2024
bf29a5c
Apply suggestions from code review
ElykDeer May 15, 2024
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
38 changes: 7 additions & 31 deletions rust/src/binaryview.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,45 +225,21 @@ pub trait BinaryViewExt: BinaryViewBase {

/// Reads up to `len` bytes from address `offset`
fn read_vec(&self, offset: u64, len: usize) -> Vec<u8> {
let mut ret = Vec::with_capacity(len);
let mut ret = vec![0; len];

unsafe {
let res;

{
let dest_slice = ret.get_unchecked_mut(0..len);
res = self.read(dest_slice, offset);
}

ret.set_len(res);
}
let size = self.read(&mut ret, offset);
ret.truncate(size);

ret
}

/// Appends up to `len` bytes from address `offset` into `dest`
fn read_into_vec(&self, dest: &mut Vec<u8>, offset: u64, len: usize) -> usize {
let starting_len = dest.len();
let space = dest.capacity() - starting_len;

if space < len {
dest.reserve(len - space);
}

unsafe {
let res;

{
let dest_slice = dest.get_unchecked_mut(starting_len..starting_len + len);
res = self.read(dest_slice, offset);
}

if res > 0 {
dest.set_len(starting_len + res);
}

res
}
dest.resize(starting_len + len, 0);
let read_size = self.read(&mut dest[starting_len..], offset);
dest.truncate(starting_len + read_size);
read_size
}

fn notify_data_written(&self, offset: u64, len: usize) {
Expand Down
Loading