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

Update stack only when callinfo is popped; fix #3521

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-03-19 00:18:59 +09:00
parent 6db38c3768
commit 75c374cad3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+5 -3
View File
@@ -1642,12 +1642,12 @@ RETRY_TRY_BLOCK:
CASE(OP_RETURN) {
/* A B return R(A) (B=normal,in-block return/break) */
if (mrb->exc) {
mrb_callinfo *ci;
mrb_callinfo *ci, *ci0;
mrb_value *stk;
int eidx;
L_RAISE:
ci = mrb->c->ci;
ci0 = ci = mrb->c->ci;
mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern_lit(mrb, "lastpc"), mrb_cptr_value(mrb, pc));
mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern_lit(mrb, "ciidx"), mrb_fixnum_value(ci - mrb->c->cibase));
eidx = ci->eidx;
@@ -1694,7 +1694,9 @@ RETRY_TRY_BLOCK:
irep = proc->body.irep;
pool = irep->pool;
syms = irep->syms;
mrb->c->stack = ci[1].stackent;
if (ci != ci0) {
mrb->c->stack = ci[1].stackent;
}
pc = mrb->c->rescue[--ci->ridx];
}
else {