Need to unshare env from top callinfo; fix #3685

matz · matz · commit 6a66ce10b3ba · 2017-06-16T08:25:34.000+09:00
diff --git a/src/vm.c b/src/vm.c
@@ -1872,14 +1872,15 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
             }
             
             ce = mrb->c->cibase + e->cioff;
-            while (--ci > ce) {
+            while (ci >= ce) {
               if (ci->env) {
                 mrb_env_unshare(mrb, ci->env);
               }
               if (ci->acc < 0) {
                 localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
                 goto L_RAISE;
               }
+              ci--;
             }
             if (ce == mrb->c->cibase) {
               localjump_error(mrb, LOCALJUMP_ERROR_RETURN);

Original file line number	Diff line number	Diff line change
`@@ -1872,14 +1872,15 @@ mrb_vm_exec(mrb_state mrb, struct RProc proc, mrb_code *pc)`
`1872`	`1872`	`}`
`1873`	`1873`
`1874`	`1874`	`ce = mrb->c->cibase + e->cioff;`
`1875`		`- while (--ci > ce) {`
	`1875`	`+ while (ci >= ce) {`
`1876`	`1876`	`if (ci->env) {`
`1877`	`1877`	`mrb_env_unshare(mrb, ci->env);`
`1878`	`1878`	`}`
`1879`	`1879`	`if (ci->acc < 0) {`
`1880`	`1880`	`localjump_error(mrb, LOCALJUMP_ERROR_RETURN);`
`1881`	`1881`	`goto L_RAISE;`
`1882`	`1882`	`}`
	`1883`	`+ ci--;`
`1883`	`1884`	`}`
`1884`	`1885`	`if (ce == mrb->c->cibase) {`
`1885`	`1886`	`localjump_error(mrb, LOCALJUMP_ERROR_RETURN);`