admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OP_STOP with exception

Browse Source 
Previously, `mrb->exc` would remain replaced by a `break` object if a rewind operation was performed during the processing of a `OP_STOP` instruction.
This problem has existed since #5060, when it was introduced in mruby-3.0.

However, as of mruby-3.0, a manual or third-party generator is required to cause the `OP_STOP` instruction to be issued.
Therefore, it is believed that this has not had an impact until now.
This commit is contained in:
dearblue
2024-03-08 21:50:46 +09:00
parent 9257a61b39
commit 4380773666
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+9 -5
View File
@@ -3068,18 +3068,22 @@ RETRY_TRY_BLOCK:
CASE(OP_STOP, Z) {
/* stop VM */
mrb_value v;
v = mrb->exc ? mrb_obj_value(mrb->exc) : mrb_nil_value();
CHECKPOINT_RESTORE(RBREAK_TAG_STOP) {
/* do nothing */
struct RBreak *brk = (struct RBreak*)mrb->exc;
v = mrb_break_value_get(brk);
}
CHECKPOINT_MAIN(RBREAK_TAG_STOP) {
UNWIND_ENSURE(mrb, mrb->c->ci, mrb->c->ci->pc, RBREAK_TAG_STOP, mrb->c->ci, mrb_nil_value());
UNWIND_ENSURE(mrb, mrb->c->ci, mrb->c->ci->pc, RBREAK_TAG_STOP, mrb->c->ci, v);
}
CHECKPOINT_END(RBREAK_TAG_STOP);
mrb->jmp = prev_jmp;
if (mrb->exc) {
mrb_assert(mrb->exc->tt == MRB_TT_EXCEPTION);
return mrb_obj_value(mrb->exc);
if (!mrb_nil_p(v)) {
mrb->exc = mrb_obj_ptr(v);
return v;
}
mrb->exc = NULL;
return regs[irep->nlocals];
}
}