christoph/wamr
1
Fork 0
Code Releases Activity

Allow empty import array for wasm-c-api wasm_instance_new (#782)

Browse Source 
Allow empty import array (but not NULL) for wasm-c-api wasm_instance_new,
which makes the code more robust, especially in use cases where imports
might be constructed dynamically.
And add a test case in samples/wasm-c-api/src/empty_imports.c to test it.
This commit is contained in:
Michael Martin
2021-10-12 19:06:38 +11:00
committed by GitHub
parent 8edca21df2
commit c94e752532
4 changed files with 107 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/iwasm/common/wasm_c_api.c
View File

@ -4230,6 +4230,7 @@ wasm_instance_new_with_args(wasm_store_t *store, const wasm_module_t *module,
{
char error_buf[128] = { 0 };
uint32 import_count = 0;
bool import_count_verified = false;
wasm_instance_t *instance = NULL;
uint32 i = 0;
bool processed = false;
@ -4265,6 +4266,7 @@ wasm_instance_new_with_args(wasm_store_t *store, const wasm_module_t *module,
goto failed;
}
}
import_count_verified = true;
}
#endif
@ -4285,6 +4287,7 @@ wasm_instance_new_with_args(wasm_store_t *store, const wasm_module_t *module,
goto failed;
}
}
import_count_verified = true;
}
#endif
@ -4292,7 +4295,7 @@ wasm_instance_new_with_args(wasm_store_t *store, const wasm_module_t *module,
* a wrong combination of module filetype and compilation flags
* also leads to below branch
*/
if (!import_count) {
if (!import_count_verified) {
goto failed;
}
}