Skip to content

ARROW-7836: [Rust] "allocate_aligned"/"reallocate" need to initialize memory to avoid UB #6422

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
paddyhoran wants to merge 2 commits into from
+7 −3
Closed

ARROW-7836: [Rust] "allocate_aligned"/"reallocate" need to initialize memory to avoid UB #6422

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a6d0f4
Initialize memory at allocation time.
paddyhoran Feb 14, 2020
c90f153
Addressed review comments.
paddyhoran Feb 14, 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
10 changes: 7 additions & 3 deletions rust/arrow/src/memory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub const ALIGNMENT: usize = 64;
pub fn allocate_aligned(size: usize) -> *mut u8 {
unsafe {
let layout = Layout::from_size_align_unchecked(size, ALIGNMENT);
std::alloc::alloc(layout)
std::alloc::alloc_zeroed(layout)
}
}

Expand All @@ -38,11 +38,15 @@ pub fn free_aligned(p: *mut u8, size: usize) {

pub fn reallocate(ptr: *mut u8, old_size: usize, new_size: usize) -> *mut u8 {
unsafe {
std::alloc::realloc(
let new_ptr = std::alloc::realloc(
ptr,
Layout::from_size_align_unchecked(old_size, ALIGNMENT),
new_size,
)
);
if !new_ptr.is_null() && new_size > old_size {
new_ptr.add(old_size).write_bytes(0, new_size - old_size);
}
new_ptr
}
}

Expand Down