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

feat(runtime-c-api) Check pointers aren't null in wasmer_import_trap.

Browse Source
This commit is contained in:
Ivan Enderlin
2020-01-13 07:20:06 +01:00
parent 4bf3d6dd41
commit 8790f6dbc9
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/runtime-c-api/src/import/mod.rs
View File

@ -674,7 +674,23 @@ pub unsafe extern "C" fn wasmer_import_func_new(
pub unsafe extern "C" fn wasmer_import_trap(
ctx: *const wasmer_instance_context_t,
error_message: *const c_char,
) -> c_uint {
) -> wasmer_result_t {
if ctx.is_null() {
update_last_error(CApiError {
msg: "ctx ptr is null in wasmer_import_trap".to_string(),
});
return wasmer_result_t::WASMER_ERROR;
}
if error_message.is_null() {
update_last_error(CApiError {
msg: "error_message is null in wasmer_import_trap".to_string(),
});
return wasmer_result_t::WASMER_ERROR;
}
let ctx = &*(ctx as *const Ctx);
let error_message = CStr::from_ptr(error_message).to_str().unwrap();
@ -683,7 +699,7 @@ pub unsafe extern "C" fn wasmer_import_trap(
.do_early_trap(Box::new(error_message)); // never returns
#[allow(unreachable_code)]
0
wasmer_result_t::WASMER_OK
}
/// Sets the params buffer to the parameter types of the given wasmer_import_func_t