Extend VM stack just in case; ref #3551

matz · matz · commit 93d802987e72 · 2017-04-01T21:21:57.000+09:00
diff --git a/src/vm.c b/src/vm.c
@@ -1202,8 +1202,10 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
       else {
         mrb_value blk = regs[bidx];
         if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
-          if(bidx >= mrb->c->ci->nregs)
+          if(bidx >= mrb->c->ci->nregs) {
+            stack_extend(mrb, bidx+1, mrb->c->ci->nregs);
             mrb->c->ci->nregs = bidx+1;
+          }
           regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
         }
       }
@@ -1439,8 +1441,10 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
         }
         blk = regs[bidx];
         if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
-          if(bidx >= ci->nregs)
+          if(bidx >= ci->nregs) {
+            stack_extend(mrb, bidx+1, ci->nregs);
             ci->nregs = bidx+1;
+          }
           regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
           ci = mrb->c->ci;
         }

Original file line number	Diff line number	Diff line change
`@@ -1202,8 +1202,10 @@ mrb_vm_exec(mrb_state mrb, struct RProc proc, mrb_code *pc)`
`1202`	`1202`	`else {`
`1203`	`1203`	`mrb_value blk = regs[bidx];`
`1204`	`1204`	`if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {`
`1205`		`- if(bidx >= mrb->c->ci->nregs)`
	`1205`	`+ if(bidx >= mrb->c->ci->nregs) {`
	`1206`	`+ stack_extend(mrb, bidx+1, mrb->c->ci->nregs);`
`1206`	`1207`	`mrb->c->ci->nregs = bidx+1;`
	`1208`	`+ }`
`1207`	`1209`	`regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");`
`1208`	`1210`	`}`
`1209`	`1211`	`}`
`@@ -1439,8 +1441,10 @@ mrb_vm_exec(mrb_state mrb, struct RProc proc, mrb_code *pc)`
`1439`	`1441`	`}`
`1440`	`1442`	`blk = regs[bidx];`
`1441`	`1443`	`if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {`
`1442`		`- if(bidx >= ci->nregs)`
	`1444`	`+ if(bidx >= ci->nregs) {`
	`1445`	`+ stack_extend(mrb, bidx+1, ci->nregs);`
`1443`	`1446`	`ci->nregs = bidx+1;`
	`1447`	`+ }`
`1444`	`1448`	`regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");`
`1445`	`1449`	`ci = mrb->c->ci;`
`1446`	`1450`	`}`