Skip to content

Update memory allocation to use size and alignment for better safety #513

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

Open
mohanson wants to merge 1 commit into
base: develop
Choose a base branch
from
+6 −6
Open

Update memory allocation to use size and alignment for better safety #513

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions definitions/src/asm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ pub struct AsmCoreMachine {

impl Drop for AsmCoreMachine {
fn drop(&mut self) {
let memory_layout = Layout::array::<u8>(self.memory_size as usize).unwrap();
let memory_layout = Layout::from_size_align(self.memory_size as usize, 8).unwrap();
unsafe { dealloc(self.memory_ptr as *mut u8, memory_layout) };
let flags_layout = Layout::array::<u8>(self.flags_size as usize).unwrap();
let flags_layout = Layout::from_size_align(self.flags_size as usize, 8).unwrap();
unsafe { dealloc(self.flags_ptr as *mut u8, flags_layout) };
let frames_layout = Layout::array::<u8>(self.frames_size as usize).unwrap();
let frames_layout = Layout::from_size_align(self.frames_size as usize, 8).unwrap();
unsafe { dealloc(self.frames_ptr as *mut u8, frames_layout) };
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/machine/asm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ impl AsmCoreMachineRevealer for AsmCoreMachine {
machine.last_read_frame = u64::MAX;
machine.last_write_page = u64::MAX;

let memory_layout = Layout::array::<u8>(machine.memory_size as usize).unwrap();
let memory_layout = Layout::from_size_align(machine.memory_size as usize, 8).unwrap();
machine.memory_ptr = unsafe { alloc(memory_layout) } as u64;
let flags_layout = Layout::array::<u8>(machine.flags_size as usize).unwrap();
let flags_layout = Layout::from_size_align(machine.flags_size as usize, 8).unwrap();
machine.flags_ptr = unsafe { alloc_zeroed(flags_layout) } as u64;
let frames_layout = Layout::array::<u8>(machine.frames_size as usize).unwrap();
let frames_layout = Layout::from_size_align(machine.frames_size as usize, 8).unwrap();
machine.frames_ptr = unsafe { alloc_zeroed(frames_layout) } as u64;

machine
Expand Down
Loading