Skip to content

Fix potential memcpy overlap issue in RECOVER_BR_INFO for i64/v128 copy #4797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lum1n0us merged 1 commit into from
Jan 26, 2026
+12 −12
Merged

Fix potential memcpy overlap issue in RECOVER_BR_INFO for i64/v128 copy #4797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions core/iwasm/interpreter/wasm_interp_fast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,9 +999,9 @@ copy_stack_values(WASMModuleInstance *module, uint32 *frame_lp, uint32 arity,
} \
} \
else if (cells[0] == 2) { \
PUT_I64_TO_ADDR( \
frame_lp + dst_offsets[0], \
GET_I64_FROM_ADDR(frame_lp + src_offsets[0])); \
int64 tmp_i64 = \
GET_I64_FROM_ADDR(frame_lp + src_offsets[0]); \
PUT_I64_TO_ADDR(frame_lp + dst_offsets[0], tmp_i64); \
/* Ignore constants because they are not reference */ \
if (src_offsets[0] >= 0) { \
CLEAR_FRAME_REF((unsigned)src_offsets[0]); \
Expand All @@ -1011,9 +1011,9 @@ copy_stack_values(WASMModuleInstance *module, uint32 *frame_lp, uint32 arity,
} \
} \
else if (cells[0] == 4) { \
PUT_V128_TO_ADDR( \
frame_lp + dst_offsets[0], \
GET_V128_FROM_ADDR(frame_lp + src_offsets[0])); \
V128 tmp_v128 = \
GET_V128_FROM_ADDR(frame_lp + src_offsets[0]); \
PUT_V128_TO_ADDR(frame_lp + dst_offsets[0], tmp_v128); \
/* Ignore constants because they are not reference */ \
if (src_offsets[0] >= 0) { \
CLEAR_FRAME_REF((unsigned)src_offsets[0]); \
Expand Down Expand Up @@ -1062,14 +1062,14 @@ copy_stack_values(WASMModuleInstance *module, uint32 *frame_lp, uint32 arity,
if (cells[0] == 1) \
frame_lp[dst_offsets[0]] = frame_lp[src_offsets[0]]; \
else if (cells[0] == 2) { \
PUT_I64_TO_ADDR( \
frame_lp + dst_offsets[0], \
GET_I64_FROM_ADDR(frame_lp + src_offsets[0])); \
int64 tmp_i64 = \
GET_I64_FROM_ADDR(frame_lp + src_offsets[0]); \
PUT_I64_TO_ADDR(frame_lp + dst_offsets[0], tmp_i64); \
} \
else if (cells[0] == 4) { \
PUT_V128_TO_ADDR( \
frame_lp + dst_offsets[0], \
GET_V128_FROM_ADDR(frame_lp + src_offsets[0])); \
V128 tmp_v128 = \
GET_V128_FROM_ADDR(frame_lp + src_offsets[0]); \
PUT_V128_TO_ADDR(frame_lp + dst_offsets[0], tmp_v128); \
} \
} \
else { \
Expand Down
Loading