gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-03-12 00:45:28 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

EH: Fix validation of delegate opcode (#3107)

Browse Source 
cf. https://github.com/bytecodealliance/wasm-micro-runtime/issues/1884#issuecomment-1914000294
This commit is contained in:
YAMAMOTO Takashi 2024-02-01 13:32:06 +09:00 committed by GitHub
parent 40e51faca8
commit edc3643909
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7128,6 +7128,40 @@ fail:
return NULL; return NULL;
} }
#if WASM_ENABLE_EXCE_HANDLING != 0
static BranchBlock *
check_branch_block_for_delegate(WASMLoaderContext *loader_ctx, uint8 **p_buf,
uint8 *buf_end, char *error_buf,
uint32 error_buf_size)
{
uint8 *p = *p_buf, *p_end = buf_end;
BranchBlock *frame_csp_tmp;
uint32 depth;
read_leb_uint32(p, p_end, depth);
/*
* Note: "delegate 0" means the surrounding block, not the
* try-delegate block itself.
*
* Note: the caller hasn't popped the try-delegate frame yet.
*/
bh_assert(loader_ctx->csp_num > 0);
if (loader_ctx->csp_num - 1 <= depth) {
set_error_buf(error_buf, error_buf_size, "unknown delegate label");
goto fail;
}
frame_csp_tmp = loader_ctx->frame_csp - depth - 2;
#if WASM_ENABLE_FAST_INTERP != 0
emit_br_info(frame_csp_tmp);
#endif
*p_buf = p;
return frame_csp_tmp;
fail:
return NULL;
}
#endif
static bool static bool
check_block_stack(WASMLoaderContext *loader_ctx, BranchBlock *block, check_block_stack(WASMLoaderContext *loader_ctx, BranchBlock *block,
char *error_buf, uint32 error_buf_size) char *error_buf, uint32 error_buf_size)
@ -7832,16 +7866,10 @@ re_scan:
case WASM_OP_DELEGATE: case WASM_OP_DELEGATE:
{ {
/* check target block is valid */ /* check target block is valid */
if (!(frame_csp_tmp = check_branch_block( if (!(frame_csp_tmp = check_branch_block_for_delegate(
loader_ctx, &p, p_end, error_buf, error_buf_size))) loader_ctx, &p, p_end, error_buf, error_buf_size)))
goto fail; goto fail;
/* valid types */
if (LABEL_TYPE_TRY != frame_csp_tmp->label_type) {
snprintf(error_buf, error_buf_size, "unknown label");
goto fail;
}
BranchBlock *cur_block = loader_ctx->frame_csp - 1; BranchBlock *cur_block = loader_ctx->frame_csp - 1;
uint8 label_type = cur_block->label_type; uint8 label_type = cur_block->label_type;