christoph/wamr
1
Fork 0
Code Releases Activity

Fix load error not reported when magic header is invalid (#3734)

Browse Source 
When AOT isn't enabled and the input is a wasm file, wasm_runtime_load doesn't
report error. Same when interpreter isn't enabled and the input is AOT file.

This PR makes wasm_runtime_load report error "magic header not detected" for
such situations.
This commit is contained in:
Wenyong Huang
2024-08-20 16:03:04 +08:00
committed by GitHub
parent c04ef6b44f
commit d67cc26d56
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/iwasm/common/wasm_runtime_common.c
View File

@ -1417,12 +1417,39 @@ wasm_runtime_load_ex(uint8 *buf, uint32 size, const LoadArgs *args,
char *error_buf, uint32 error_buf_size) char *error_buf, uint32 error_buf_size)
{ {
WASMModuleCommon *module_common = NULL; WASMModuleCommon *module_common = NULL;
uint32 package_type;
bool magic_header_detected = false;
if (!args) { if (!args) {
set_error_buf(error_buf, error_buf_size,
"WASM module load failed: null load arguments");
return NULL; return NULL;
} }
if (get_package_type(buf, size) == Wasm_Module_Bytecode) { if (size < 4) {
set_error_buf(error_buf, error_buf_size,
"WASM module load failed: unexpected end");
return NULL;
}
package_type = get_package_type(buf, size);
if (package_type == Wasm_Module_Bytecode) {
#if WASM_ENABLE_INTERP != 0
magic_header_detected = true;
#endif
}
else if (package_type == Wasm_Module_AoT) {
#if WASM_ENABLE_AOT != 0
magic_header_detected = true;
#endif
}
if (!magic_header_detected) {
set_error_buf(error_buf, error_buf_size,
"WASM module load failed: magic header not detected");
return NULL;
}
if (package_type == Wasm_Module_Bytecode) {
#if WASM_ENABLE_INTERP != 0 #if WASM_ENABLE_INTERP != 0
module_common = module_common =
(WASMModuleCommon *)wasm_load(buf, size, (WASMModuleCommon *)wasm_load(buf, size,
@ -1435,7 +1462,7 @@ wasm_runtime_load_ex(uint8 *buf, uint32 size, const LoadArgs *args,
args->wasm_binary_freeable; args->wasm_binary_freeable;
#endif #endif
} }
else if (get_package_type(buf, size) == Wasm_Module_AoT) { else if (package_type == Wasm_Module_AoT) {
#if WASM_ENABLE_AOT != 0 #if WASM_ENABLE_AOT != 0
module_common = (WASMModuleCommon *)aot_load_from_aot_file( module_common = (WASMModuleCommon *)aot_load_from_aot_file(
buf, size, args, error_buf, error_buf_size); buf, size, args, error_buf, error_buf_size);
@ -1444,15 +1471,7 @@ wasm_runtime_load_ex(uint8 *buf, uint32 size, const LoadArgs *args,
args->wasm_binary_freeable; args->wasm_binary_freeable;
#endif #endif
} }
else {
if (size < 4)
set_error_buf(error_buf, error_buf_size,
"WASM module load failed: unexpected end");
else
set_error_buf(error_buf, error_buf_size,
"WASM module load failed: magic header not detected");
return NULL;
}
if (!module_common) { if (!module_common) {
LOG_DEBUG("WASM module load failed"); LOG_DEBUG("WASM module load failed");
return NULL; return NULL;