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

Removed the unwrap to ensure the WASM instance can't crash the host

Browse Source
This commit is contained in:
ccgauche 2021-02-17 18:05:49 +01:00 committed by Marcel Märtens
parent 387daf8aea
commit a12e554266
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,10 +54,13 @@ impl PluginModule {
}
fn raw_retrieve_action(env: &HostFunctionEnvironement, ptr: u32, len: u32) -> i64 {
// TODO: Handle correctly the error
let data: Retrieve = env.read_data(ptr as _, len).unwrap();
let out = match env.read_data(ptr as _, len) {
Ok(data) => retrieve_action(&env.ecs, data),
Err(e) => Err(RetrieveError::BincodeError(e.to_string())),
};
let out = retrieve_action(&env.ecs, data);
// If an error happen set the i64 to 0 so the WASM side can tell an error
// occured
let (ptr, len) = env.write_data(&out).unwrap();
to_i64(ptr, len as _)
}