Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Runned FMT

Browse Source
This commit is contained in:
ccgauche 2020-12-14 18:46:04 +01:00
parent 69dba49884
commit ea1efd1ce1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/sys/src/plugin/module.rs
View File

@ -60,7 +60,9 @@ impl PluginModule {
Ok(e) => e, Ok(e) => e,
Err(e) => return Some(Err(e)), Err(e) => return Some(Err(e)),
}; };
match execute_raw(&instance, &func, &request.bytes).map_err(PluginModuleError::RunFunction) { match execute_raw(&instance, &func, &request.bytes)
.map_err(PluginModuleError::RunFunction)
{
Ok(e) => e, Ok(e) => e,
Err(e) => return Some(Err(e)), Err(e) => return Some(Err(e)),
} }
@ -102,15 +104,17 @@ fn execute_raw(
// This reserves space for the buffer // This reserves space for the buffer
let len = bytes.len(); let len = bytes.len();
let start = { let start = {
let memory_pos = reserve_wasm_memory_buffer(len,instance).expect("Fatal error while allocating memory for a plugin! Closing server...") as usize; let memory_pos = reserve_wasm_memory_buffer(len, instance)
.expect("Fatal error while allocating memory for a plugin! Closing server...")
as usize;
let memory = instance.context().memory(0); let memory = instance.context().memory(0);
let view = memory.view::<u8>(); let view = memory.view::<u8>();
for (cell, byte) in view[memory_pos..memory_pos+len].iter().zip(bytes.iter()) { for (cell, byte) in view[memory_pos..memory_pos + len].iter().zip(bytes.iter()) {
cell.set(*byte) cell.set(*byte)
} }
function.call(memory_pos as i32, len as u32)? as usize function.call(memory_pos as i32, len as u32)? as usize
}; };
let memory = instance.context().memory(0); let memory = instance.context().memory(0);
let view = memory.view::<u8>(); let view = memory.view::<u8>();
let mut new_len_bytes = [0u8; 4]; let mut new_len_bytes = [0u8; 4];
@ -171,4 +175,4 @@ fn reserve_wasm_memory_buffer<'a>(
.map_err(MemoryAllocationError::AllocatorNotFound)? .map_err(MemoryAllocationError::AllocatorNotFound)?
.call(value as i32) .call(value as i32)
.map_err(MemoryAllocationError::CantAllocate) .map_err(MemoryAllocationError::CantAllocate)
} }