summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-04-17 02:46:17 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2013-04-17 02:46:17 -0700
commit2d6ff9e82c1df08e99925ced3cac01c785c244c4 (patch)
tree9b063196911c27ef79145448b0d9e7d0149b81e5 /src
parent4b24ee189ef5b2190562ce4c67d48c3170bdc2a2 (diff)
parent7626508f62b3bafc756e87e97f0fef2d6013b388 (diff)
downloadmruby-2d6ff9e82c1df08e99925ced3cac01c785c244c4.tar.gz
mruby-2d6ff9e82c1df08e99925ced3cac01c785c244c4.zip
Merge pull request #1184 from iij/pr-ensure-on-correct-stack
Rollback stack before executing ensure clause.
Diffstat (limited to 'src')
-rw-r--r--src/vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm.c b/src/vm.c
index 9224c7a40..e3c53d4a2 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1219,9 +1219,9 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
while (ci[0].ridx == ci[-1].ridx) {
cipop(mrb);
ci = mrb->ci;
+ mrb->stack = mrb->stbase + ci[1].stackidx;
if (ci[1].acc < 0 && prev_jmp) {
mrb->jmp = prev_jmp;
- mrb->stack = mrb->stbase + ci[1].stackidx;
longjmp(*(jmp_buf*)mrb->jmp, 1);
}
while (eidx > mrb->ci->eidx) {