summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-03-16 21:40:22 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-03-16 21:40:22 +0900
commitb64f08784cc50861dec80c26fce715982c02c9e9 (patch)
tree6f47ea48a986b089246f2e744b0ab8fc73e22e72 /src
parentf8b31a0db671b71d2794ce866b87596a09c10bf0 (diff)
downloadmruby-b64f08784cc50861dec80c26fce715982c02c9e9.tar.gz
mruby-b64f08784cc50861dec80c26fce715982c02c9e9.zip
Protect stack region before calling mrb_convert_type(); fix #3504
Diffstat (limited to 'src')
-rw-r--r--src/vm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vm.c b/src/vm.c
index 946d68323..afe0422f8 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1207,6 +1207,7 @@ RETRY_TRY_BLOCK:
else {
mrb_value blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
+ ci->nregs = bidx+1;
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
}
}
@@ -1438,6 +1439,7 @@ RETRY_TRY_BLOCK:
}
blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
+ ci->nregs = bidx+1;
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
ci = mrb->c->ci;
}