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

Merge branch 'master' into fix-runtime-c-api-warnings

Browse Source
This commit is contained in:
Ivan Enderlin
2019-06-14 10:07:53 +02:00
committed by GitHub
parent 3f975457c7 52c02de409
commit 04c9d25194
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/runtime-c-api/src/module.rs
View File

@ -126,14 +126,14 @@ pub unsafe extern "C" fn wasmer_module_instantiate(
}
let module = &*(module as *const Module);
let new_instance = if let Ok(res) = module.instantiate(&import_object) {
res
} else {
update_last_error(CApiError {
msg: "error instantiating from module".to_string(),
});
return wasmer_result_t::WASMER_ERROR;
let new_instance = match module.instantiate(&import_object) {
Ok(instance) => instance,
Err(error) => {
update_last_error(error);
return wasmer_result_t::WASMER_ERROR;
}
};
*instance = Box::into_raw(Box::new(new_instance)) as *mut wasmer_instance_t;
wasmer_result_t::WASMER_OK
}