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

Fixed unwinding block that could point to invalid PC

Browse Source 
Switching back from a fiber with an exception could point to an invalid PC.
The investigation was inspired by #6060.
This commit is contained in:
dearblue
2023-10-10 21:29:38 +09:00
parent 097681b4d4
commit e7828bac4d
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+1 -2
View File
@@ -2210,14 +2210,13 @@ RETRY_TRY_BLOCK:
if (mrb->exc) {
L_RAISE:
ci = mrb->c->ci;
while ((ch = catch_handler_find(mrb, ci, pc, MRB_CATCH_FILTER_ALL)) == NULL) {
while ((ch = catch_handler_find(mrb, ci, ci->pc, MRB_CATCH_FILTER_ALL)) == NULL) {
if (ci != mrb->c->cibase) {
ci = cipop(mrb);
if (ci[1].cci == CINFO_SKIP && prev_jmp) {
mrb->jmp = prev_jmp;
MRB_THROW(prev_jmp);
}
pc = ci[0].pc;
}
else if (mrb->c == mrb->root_c) {
mrb->c->ci->stack = mrb->c->stbase;