Skip to content
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

Jump to bottom

fix: null-defer about data and elem in wasm-interp #2436

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −6
Open

fix: null-defer about data and elem in wasm-interp #2436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16431b9
fix: null-defer about data and elem in wasm-interp
tianstcht Jun 27, 2024
82b39c0
fix: resolve type conversion conflicts in some OS
tianstcht Jun 28, 2024
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
4 changes: 2 additions & 2 deletions include/wabt/interp/interp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,12 +1163,12 @@ class Thread {
RunResult DoStore(Instr, Trap::Ptr* out_trap);

RunResult DoMemoryInit(Instr, Trap::Ptr* out_trap);
RunResult DoDataDrop(Instr);
RunResult DoDataDrop(Instr, Trap::Ptr* out_trap);
RunResult DoMemoryCopy(Instr, Trap::Ptr* out_trap);
RunResult DoMemoryFill(Instr, Trap::Ptr* out_trap);

RunResult DoTableInit(Instr, Trap::Ptr* out_trap);
RunResult DoElemDrop(Instr);
RunResult DoElemDrop(Instr, Trap::Ptr* out_trap);
RunResult DoTableCopy(Instr, Trap::Ptr* out_trap);
RunResult DoTableGet(Instr, Trap::Ptr* out_trap);
RunResult DoTableSet(Instr, Trap::Ptr* out_trap);
Expand Down
24 changes: 20 additions & 4 deletions src/interp/interp.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,12 +1524,12 @@ RunResult Thread::StepInternal(Trap::Ptr* out_trap) {
case O::I64TruncSatF64U: return DoUnop(IntTruncSat<u64, f64>);

case O::MemoryInit: return DoMemoryInit(instr, out_trap);
case O::DataDrop: return DoDataDrop(instr);
case O::DataDrop: return DoDataDrop(instr, out_trap);
case O::MemoryCopy: return DoMemoryCopy(instr, out_trap);
case O::MemoryFill: return DoMemoryFill(instr, out_trap);

case O::TableInit: return DoTableInit(instr, out_trap);
case O::ElemDrop: return DoElemDrop(instr);
case O::ElemDrop: return DoElemDrop(instr, out_trap);
case O::TableCopy: return DoTableCopy(instr, out_trap);
case O::TableGet: return DoTableGet(instr, out_trap);
case O::TableSet: return DoTableSet(instr, out_trap);
Expand Down Expand Up @@ -2084,6 +2084,10 @@ RunResult Thread::DoReinterpret() {

RunResult Thread::DoMemoryInit(Instr instr, Trap::Ptr* out_trap) {
Memory::Ptr memory{store_, inst_->memories()[instr.imm_u32x2.fst]};
TRAP_IF(inst_->datas().size() <= instr.imm_u32x2.snd,
StringPrintf("out of bounds data access: access at %u "
">= max value %zu",
instr.imm_u32x2.snd, inst_->datas().size()));
auto&& data = inst_->datas()[instr.imm_u32x2.snd];
auto size = Pop<u32>();
auto src = Pop<u32>();
Expand All @@ -2093,7 +2097,11 @@ RunResult Thread::DoMemoryInit(Instr instr, Trap::Ptr* out_trap) {
return RunResult::Ok;
}

RunResult Thread::DoDataDrop(Instr instr) {
RunResult Thread::DoDataDrop(Instr instr, Trap::Ptr* out_trap) {
TRAP_IF(inst_->datas().size() <= instr.imm_u32,
StringPrintf("out of bounds data access: access at %u "
">= max value %zu",
instr.imm_u32, inst_->datas().size()));
inst_->datas()[instr.imm_u32].Drop();
return RunResult::Ok;
}
Expand Down Expand Up @@ -2122,6 +2130,10 @@ RunResult Thread::DoMemoryFill(Instr instr, Trap::Ptr* out_trap) {

RunResult Thread::DoTableInit(Instr instr, Trap::Ptr* out_trap) {
Table::Ptr table{store_, inst_->tables()[instr.imm_u32x2.fst]};
TRAP_IF(inst_->elems().size() <= instr.imm_u32x2.snd,
StringPrintf("out of bounds elem access: access at %u "
">= max value %zu",
instr.imm_u32x2.snd, inst_->elems().size()));
auto&& elem = inst_->elems()[instr.imm_u32x2.snd];
auto size = Pop<u32>();
auto src = Pop<u32>();
Expand All @@ -2131,7 +2143,11 @@ RunResult Thread::DoTableInit(Instr instr, Trap::Ptr* out_trap) {
return RunResult::Ok;
}

RunResult Thread::DoElemDrop(Instr instr) {
RunResult Thread::DoElemDrop(Instr instr, Trap::Ptr* out_trap) {
TRAP_IF(inst_->elems().size() <= instr.imm_u32,
StringPrintf("out of bounds elem access: access at %u "
">= max value %zu",
instr.imm_u32, inst_->elems().size()));
inst_->elems()[instr.imm_u32].Drop();
return RunResult::Ok;
}
Expand Down
Loading