fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-25 06:31:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix CodeMemory::new(0)

Browse Source
This commit is contained in:
losfair
2019-08-22 11:57:58 -07:00
parent 86814a1920
commit 7491b360ac
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/runtime-core/src/loader.rs
View File

@ -137,13 +137,20 @@ impl CodeMemory {
#[cfg(unix)] #[cfg(unix)]
impl CodeMemory { impl CodeMemory {
pub fn new(size: usize) -> CodeMemory { pub fn new(size: usize) -> CodeMemory {
if size == 0 {
return CodeMemory {
ptr: std::ptr::null_mut(),
size: 0,
};
}
fn round_up_to_page_size(size: usize) -> usize { fn round_up_to_page_size(size: usize) -> usize {
(size + (4096 - 1)) & !(4096 - 1) (size + (4096 - 1)) & !(4096 - 1)
} }
let size = round_up_to_page_size(size); let size = round_up_to_page_size(size);
let ptr = unsafe { let ptr = unsafe {
mmap( mmap(
::std::ptr::null_mut(), std::ptr::null_mut(),
size, size,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANON, MAP_PRIVATE | MAP_ANON,