fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-28 08:01:33 +00:00
Code Issues Projects Releases Wiki Activity

fix memory access in WasmPtr

Browse Source
This commit is contained in:
Mark McCaskey
2019-04-18 17:48:14 -07:00
parent 7e58c4258c
commit 19e830d25a
4 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/wasi/src/ptr.rs
View File

@ -36,10 +36,11 @@ impl<T: Copy + ValueType> WasmPtr<T, Item> {
return Err(__WASI_EFAULT);
}
unsafe {
let cell_ptr = memory
.view::<T>()
.get_unchecked((self.offset() as usize) / mem::size_of::<T>())
as *const _;
let aligner = |ptr: usize, align: usize| ptr & !(align - 1);
let cell_ptr = aligner(
memory.view::<u8>().as_ptr().add(self.offset as usize) as usize,
mem::align_of::<T>(),
) as *const Cell<T>;
Ok(&*cell_ptr)
}
}