fixed wrong stack adjustment for ensure clauses; fix #3175

This commit is contained in:
Yukihiro "Matz" Matsumoto
2016-11-07 00:44:08 +09:00
parent 0b8d8dd379
commit 6c299aae67
2 changed files with 7 additions and 1 deletions
+3
View File
@@ -1513,6 +1513,7 @@ RETRY_TRY_BLOCK:
/* A B return R(A) (B=normal,in-block return/break) */
if (mrb->exc) {
mrb_callinfo *ci;
mrb_value *stk;
int eidx;
L_RAISE:
@@ -1524,6 +1525,7 @@ RETRY_TRY_BLOCK:
if (ci->ridx == 0) goto L_STOP;
goto L_RESCUE;
}
stk = mrb->c->stack;
while (ci[0].ridx == ci[-1].ridx) {
cipop(mrb);
ci = mrb->c->ci;
@@ -1533,6 +1535,7 @@ RETRY_TRY_BLOCK:
MRB_THROW(prev_jmp);
}
if (ci == mrb->c->cibase) {
mrb->c->stack = stk;
while (eidx > 0) {
ecall(mrb, --eidx);
}