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

Should check if callinfo stack is popped before updating the stack.

Browse Source 
This is a resurrection of 75c374c, which is accidentally removed by
93f5f22; Fix #3507 #3512 #3518 #3521
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-10-28 21:44:56 +09:00
parent c7c9543bed
commit 92e24f809b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+5 -2
View File
@@ -1845,10 +1845,11 @@ RETRY_TRY_BLOCK:
}
if (mrb->exc) {
mrb_callinfo *ci0;
mrb_value *stk;
L_RAISE:
ci = mrb->c->ci;
ci0 = ci = mrb->c->ci;
if (ci == mrb->c->cibase) {
if (ci->ridx == 0) goto L_FTOP;
goto L_RESCUE;
@@ -1900,7 +1901,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;
}
stack_extend(mrb, irep->nregs);
pc = mrb->c->rescue[--ci->ridx];
}