summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-04-01 18:54:37 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-04-01 18:54:37 +0900
commit071164b7999d0932fd60fb3c580a6c374ab1cf4f (patch)
tree49fbc9c93ff4494b9e31cc7774e86c24d4f47580 /src
parent56322cd5dd495f0b82b2bd4abf11208877ab25a3 (diff)
downloadmruby-071164b7999d0932fd60fb3c580a6c374ab1cf4f.tar.gz
mruby-071164b7999d0932fd60fb3c580a6c374ab1cf4f.zip
Should not shrink VM stack; fix #3551
Diffstat (limited to 'src')
-rw-r--r--src/vm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/vm.c b/src/vm.c
index 93af6219e..94892569f 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1202,7 +1202,8 @@ RETRY_TRY_BLOCK:
else {
mrb_value blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
- mrb->c->ci->nregs = bidx+1;
+ if(bidx >= mrb->c->ci->nregs)
+ mrb->c->ci->nregs = bidx+1;
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
}
}
@@ -1438,7 +1439,8 @@ RETRY_TRY_BLOCK:
}
blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
- ci->nregs = bidx+1;
+ if(bidx >= ci->nregs)
+ ci->nregs = bidx+1;
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
ci = mrb->c->ci;
}