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

Add null checks to new destructors in C API

Browse Source
This commit is contained in:
Mark McCaskey 2019-10-29 15:18:45 -07:00
parent a104d08c04
commit bc9b92c323
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,7 +315,9 @@ pub unsafe extern "C" fn wasmer_import_object_iter_at_end(
pub unsafe extern "C" fn wasmer_import_object_iter_destroy( pub unsafe extern "C" fn wasmer_import_object_iter_destroy(
import_object_iter: *mut wasmer_import_object_iter_t, import_object_iter: *mut wasmer_import_object_iter_t,
) { ) {
let _ = Box::from_raw(import_object_iter as *mut WasmerImportObjectIterator); if !import_object_iter.is_null() {
let _ = Box::from_raw(import_object_iter as *mut WasmerImportObjectIterator);
}
} }
/// Frees the memory allocated in `wasmer_import_object_iter_next` /// Frees the memory allocated in `wasmer_import_object_iter_next`
@ -327,6 +329,9 @@ pub unsafe extern "C" fn wasmer_import_object_imports_destroy(
imports: *mut wasmer_import_t, imports: *mut wasmer_import_t,
imports_len: u32, imports_len: u32,
) { ) {
if imports.is_null() {
return;
}
let imports: &[wasmer_import_t] = &*slice::from_raw_parts_mut(imports, imports_len as usize); let imports: &[wasmer_import_t] = &*slice::from_raw_parts_mut(imports, imports_len as usize);
for import in imports { for import in imports {
let _namespace: Vec<u8> = Vec::from_raw_parts( let _namespace: Vec<u8> = Vec::from_raw_parts(

2
lib/runtime-c-api/tests/.gitignore vendored
View File

@ -25,3 +25,5 @@ test-tables
test-validate test-validate
test-context test-context
test-module-import-instantiate test-module-import-instantiate
test-wasi-import-object