christoph/wamr
1
Fork 0
Code Releases Activity

Fix wasm-c-api import func link issue in wasm_instance_new (#1787)

Browse Source 
When a wasm module is duplicated instantiated with wasm_instance_new,
the function import info of the previous instantiation may be overwritten by
the later instantiation, which may cause unexpected behavior.

Store the function import info into the module instance to fix the issue.
This commit is contained in:
Wenyong Huang
2022-12-07 16:43:04 +08:00
parent 0c85cb1fe6
commit 37e9b9c510
8 changed files with 128 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/iwasm/interpreter/wasm_runtime.c
View File

@ -1948,6 +1948,9 @@ wasm_deinstantiate(WASMModuleInstance *module_inst, bool is_sub_inst)
os_mutex_destroy(&module_inst->e->mem_lock);
#endif
if (module_inst->e->c_api_func_imports)
wasm_runtime_free(module_inst->e->c_api_func_imports);
wasm_runtime_free(module_inst);
}
@ -2851,6 +2854,7 @@ llvm_jit_invoke_native(WASMExecEnv *exec_env, uint32 func_idx, uint32 argc,
WASMType *func_type;
void *func_ptr;
WASMFunctionImport *import_func;
CApiFuncImport *c_api_func_import = NULL;
const char *signature;
void *attachment;
char buf[96];
@ -2872,6 +2876,11 @@ llvm_jit_invoke_native(WASMExecEnv *exec_env, uint32 func_idx, uint32 argc,
bh_assert(func_idx < module->import_function_count);
import_func = &module->import_functions[func_idx].u.function;
if (import_func->call_conv_wasm_c_api) {
c_api_func_import = module_inst->e->c_api_func_imports + func_idx;
func_ptr = c_api_func_import->func_ptr_linked;
}
if (!func_ptr) {
snprintf(buf, sizeof(buf),
"failed to call unlinked import function (%s, %s)",
@ -2884,7 +2893,7 @@ llvm_jit_invoke_native(WASMExecEnv *exec_env, uint32 func_idx, uint32 argc,
if (import_func->call_conv_wasm_c_api) {
ret = wasm_runtime_invoke_c_api_native(
(WASMModuleInstanceCommon *)module_inst, func_ptr, func_type, argc,
argv, import_func->wasm_c_api_with_env, attachment);
argv, c_api_func_import->with_env_arg, c_api_func_import->env_arg);
}
else if (!import_func->call_conv_raw) {
signature = import_func->signature;