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

feat(runtime-c-api) wasmer_memory_grow returns WASMER_ERROR if memory is NULL.

Browse Source
This commit is contained in:
Ivan Enderlin
2020-02-10 11:08:59 +01:00
parent 534db599b2
commit 59d35656a9
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/runtime-c-api/src/memory.rs
View File

@ -1,6 +1,9 @@
//! Create, read, write, grow, destroy memory of an instance. //! Create, read, write, grow, destroy memory of an instance.
use crate::{error::update_last_error, error::CApiError, wasmer_limits_t, wasmer_result_t}; use crate::{
error::{update_last_error, CApiError},
wasmer_limits_t, wasmer_result_t,
};
use std::cell::Cell; use std::cell::Cell;
use wasmer_runtime::Memory; use wasmer_runtime::Memory;
use wasmer_runtime_core::{ use wasmer_runtime_core::{
@ -100,7 +103,7 @@ pub unsafe extern "C" fn wasmer_memory_new(
/// Example: /// Example:
/// ///
/// ```c /// ```c
/// wasmer_result_t result = wasmer_memory_grow(memory, 10 /* pages */); /// wasmer_result_t result = wasmer_memory_grow(memory, 10);
/// ///
/// if (result != WASMER_OK) { /// if (result != WASMER_OK) {
/// // … /// // …
@ -109,12 +112,22 @@ pub unsafe extern "C" fn wasmer_memory_new(
#[allow(clippy::cast_ptr_alignment)] #[allow(clippy::cast_ptr_alignment)]
#[no_mangle] #[no_mangle]
pub extern "C" fn wasmer_memory_grow(memory: *mut wasmer_memory_t, delta: u32) -> wasmer_result_t { pub extern "C" fn wasmer_memory_grow(memory: *mut wasmer_memory_t, delta: u32) -> wasmer_result_t {
if memory.is_null() {
update_last_error(CApiError {
msg: "`memory` is NULL.".to_string(),
});
return wasmer_result_t::WASMER_ERROR;
}
let memory = unsafe { &*(memory as *mut Memory) }; let memory = unsafe { &*(memory as *mut Memory) };
let delta_result = memory.grow(Pages(delta)); let delta_result = memory.grow(Pages(delta));
match delta_result { match delta_result {
Ok(_) => wasmer_result_t::WASMER_OK, Ok(_) => wasmer_result_t::WASMER_OK,
Err(grow_error) => { Err(grow_error) => {
update_last_error(grow_error); update_last_error(grow_error);
wasmer_result_t::WASMER_ERROR wasmer_result_t::WASMER_ERROR
} }
} }