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

Fix bug of reading magic number and version in big endian platform (#41)

Browse Source
This commit is contained in:
wenyongh 2019-06-13 22:29:08 -05:00 committed by GitHub
parent 7f1e024fce
commit 5b0c8fa0ba
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/iwasm/runtime/vmcore-wasm/wasm_loader.c
View File

@ -1335,6 +1335,18 @@ create_sections(const uint8 *buf, uint32 size,
return true; return true;
} }
static void
exchange32(uint8* p_data)
{
uint8 value = *p_data;
*p_data = *(p_data + 3);
*(p_data + 3) = value;
value = *(p_data + 1);
*(p_data + 1) = *(p_data + 2);
*(p_data + 2) = value;
}
static bool static bool
load(const uint8 *buf, uint32 size, WASMModule *module, load(const uint8 *buf, uint32 size, WASMModule *module,
char *error_buf, uint32 error_buf_size) char *error_buf, uint32 error_buf_size)
@ -1345,13 +1357,21 @@ load(const uint8 *buf, uint32 size, WASMModule *module,
WASMSection *section_list = NULL; WASMSection *section_list = NULL;
CHECK_BUF(p, p_end, sizeof(uint32)); CHECK_BUF(p, p_end, sizeof(uint32));
if ((magic_number = read_uint32(p)) != WASM_MAGIC_NUMBER) { magic_number = read_uint32(p);
if (!is_little_endian)
exchange32((uint8*)&magic_number);
if (magic_number != WASM_MAGIC_NUMBER) {
set_error_buf(error_buf, error_buf_size, "magic header not detected"); set_error_buf(error_buf, error_buf_size, "magic header not detected");
return false; return false;
} }
CHECK_BUF(p, p_end, sizeof(uint32)); CHECK_BUF(p, p_end, sizeof(uint32));
if ((version = read_uint32(p)) != WASM_CURRENT_VERSION) { version = read_uint32(p);
if (!is_little_endian)
exchange32((uint8*)&version);
if (version != WASM_CURRENT_VERSION) {
set_error_buf(error_buf, error_buf_size, "unknown binary version"); set_error_buf(error_buf, error_buf_size, "unknown binary version");
return false; return false;
} }