gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-02-06 06:55:07 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Appease some UBSan complaints (#720)

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2021-09-04 11:09:30 +09:00 committed by GitHub
parent 4e4d48e72b
commit 79f163d08b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/iwasm/interpreter/wasm_loader.c
View File

@ -8580,26 +8580,27 @@ unsupported_opcode:
goto re_scan; goto re_scan;
func->const_cell_num = loader_ctx->const_cell_num; func->const_cell_num = loader_ctx->const_cell_num;
if (func->const_cell_num > 0 if (func->const_cell_num > 0) {
&& !(func->consts = func_const = if (!(func->consts = func_const =
loader_malloc(func->const_cell_num * 4, loader_malloc(func->const_cell_num * 4,
error_buf, error_buf_size))) { error_buf, error_buf_size)))
goto fail; goto fail;
}
func_const_end = func->consts + func->const_cell_num * 4; func_const_end = func->consts + func->const_cell_num * 4;
/* reverse the const buf */ /* reverse the const buf */
for (int i = loader_ctx->num_const - 1; i >= 0; i--) { for (int i = loader_ctx->num_const - 1; i >= 0; i--) {
Const *c = (Const*)(loader_ctx->const_buf + i * sizeof(Const)); Const *c = (Const*)(loader_ctx->const_buf + i * sizeof(Const));
if (c->value_type == VALUE_TYPE_F64 if (c->value_type == VALUE_TYPE_F64
|| c->value_type == VALUE_TYPE_I64) { || c->value_type == VALUE_TYPE_I64) {
bh_memcpy_s(func_const, (uint32)(func_const_end - func_const), bh_memcpy_s(func_const, (uint32)(func_const_end - func_const),
&(c->value.f64), (uint32)sizeof(int64)); &(c->value.f64), (uint32)sizeof(int64));
func_const += sizeof(int64); func_const += sizeof(int64);
} }
else { else {
bh_memcpy_s(func_const, (uint32)(func_const_end - func_const), bh_memcpy_s(func_const, (uint32)(func_const_end - func_const),
&(c->value.f32), (uint32)sizeof(int32)); &(c->value.f32), (uint32)sizeof(int32));
func_const += sizeof(int32); func_const += sizeof(int32);
}
} }
} }

5
core/shared/platform/include/platform_common.h
View File

@ -80,8 +80,13 @@ int BH_VPRINTF(const char *format, va_list ap);
/* Return the offset of the given field in the given type */ /* Return the offset of the given field in the given type */
#ifndef offsetof #ifndef offsetof
/* GCC 4.0 and later has the builtin. */
#if defined(__GNUC__) && __GNUC__ >= 4
#define offsetof(Type, field) __builtin_offsetof(Type, field)
#else
#define offsetof(Type, field) ((size_t)(&((Type *)0)->field)) #define offsetof(Type, field) ((size_t)(&((Type *)0)->field))
#endif #endif
#endif
typedef uint8_t uint8; typedef uint8_t uint8;
typedef int8_t int8; typedef int8_t int8;