mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-07 21:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(c-api) Restore a bug with wasi_get_imports.

Browse Source 
We said that `wasi_get_imports` was taking ownership of
`wasi_env_t`. It wasn't. In 9e63ba9a25,
we have fixed this. But it creates another bug when `wasi_env_t` is
used _after_ for example when calling `wasi_env_read_stdout`.

So this patch reverts the bug fix. And we will discuss about how to
fix that later.
This commit is contained in:
Ivan Enderlin
2021-02-02 13:42:29 +01:00
parent e5d5303b50
commit 698a26c7fe
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/c-api/src/wasm_c_api/wasi/mod.rs
View File

@@ -479,13 +479,11 @@ pub extern "C" fn wasm_named_extern_unwrap(
/// implementation with no particular order. Each import has its
/// associated module name and name, so that it can be re-order later
/// based on the `wasm_module_t` requirements.
///
/// This function takes ownership of `wasm_env_t`.
#[no_mangle]
pub unsafe extern "C" fn wasi_get_unordered_imports(
store: Option<&wasm_store_t>,
module: Option<&wasm_module_t>,
wasi_env: Option<Box<wasi_env_t>>,
wasi_env: Option<&wasi_env_t>,
imports: &mut wasm_named_extern_vec_t,
) -> bool {
wasi_get_unordered_imports_inner(store, module, wasi_env, imports).is_some()
@@ -494,7 +492,7 @@ pub unsafe extern "C" fn wasi_get_unordered_imports(
fn wasi_get_unordered_imports_inner(
store: Option<&wasm_store_t>,
module: Option<&wasm_module_t>,
wasi_env: Option<Box<wasi_env_t>>,
wasi_env: Option<&wasi_env_t>,
imports: &mut wasm_named_extern_vec_t,
) -> Option<()> {
let store = store?;
@@ -535,23 +533,20 @@ fn wasi_get_unordered_imports_inner(
/// Non-standard function to get the imports needed for the WASI
/// implementation ordered as expected by the `wasm_module_t`.
///
/// This function takes ownership of `wasm_env_t`.
#[no_mangle]
pub unsafe extern "C" fn wasi_get_imports(
store: Option<&wasm_store_t>,
module: Option<&wasm_module_t>,
wasi_env: Option<Box<wasi_env_t>>,
wasi_env: Option<&wasi_env_t>,
imports: &mut wasm_extern_vec_t,
) -> bool {
wasi_get_imports_inner(store, module, wasi_env, imports).is_some()
}
/// Takes ownership of `wasi_env_t`.
fn wasi_get_imports_inner(
store: Option<&wasm_store_t>,
module: Option<&wasm_module_t>,
wasi_env: Option<Box<wasi_env_t>>,
wasi_env: Option<&wasi_env_t>,
imports: &mut wasm_extern_vec_t,
) -> Option<()> {
let store = store?;