gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2024-10-16 13:02:32 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

wasm_cluster_spread_custom_data: Fix a crash when called before exec (#1257)

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2022-06-29 14:21:03 +09:00 committed by GitHub
parent d5d6b7284d
commit 2b49a0b817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/iwasm/libraries/thread-mgr/thread_manager.c
View File

@ -937,12 +937,18 @@ wasm_cluster_spread_custom_data(WASMModuleInstanceCommon *module_inst,
void *custom_data)
{
WASMExecEnv *exec_env = wasm_clusters_search_exec_env(module_inst);
WASMCluster *cluster = NULL;
bh_assert(exec_env);
cluster = wasm_exec_env_get_cluster(exec_env);
bh_assert(cluster);
if (exec_env == NULL) {
/* Maybe threads have not been started yet. */
wasm_runtime_set_custom_data_internal(module_inst, custom_data);
}
else {
WASMCluster *cluster;
traverse_list(&cluster->exec_env_list, set_custom_data_visitor,
custom_data);
cluster = wasm_exec_env_get_cluster(exec_env);
bh_assert(cluster);
traverse_list(&cluster->exec_env_list, set_custom_data_visitor,
custom_data);
}
}