Skip to content

M
mruby
Commit e6c757b5 authored by mirichi's avatar mirichi
Browse files
Options

bug fixed

parent 81952240
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
src/vm.c
View file @ e6c757b5
...@@ -165,9 +165,9 @@ stack_extend(mrb_state *mrb, int room, int init, int keep) ...@@ -165,9 +165,9 @@ stack_extend(mrb_state *mrb, int room, int init, int keep)
if (mrb->c->stack + room >= mrb->c->stend) { if (mrb->c->stack + room >= mrb->c->stend) {
stack_extend_alloc(mrb, room); stack_extend_alloc(mrb, room);
} }
if (room > keep) { if (init > keep) {
/* do not leave uninitialized malloc region */ /* do not leave uninitialized malloc region */
stack_clear(&(mrb->c->stack[keep]), init); stack_clear(&(mrb->c->stack[keep]), init - keep);
} }
} }
...@@ -509,7 +509,7 @@ mrb_yield_with_class(mrb_state *mrb, mrb_value b, int argc, const mrb_value *arg ...@@ -509,7 +509,7 @@ mrb_yield_with_class(mrb_state *mrb, mrb_value b, int argc, const mrb_value *arg
mrb->c->stack = mrb->c->stack + n; mrb->c->stack = mrb->c->stack + n;
if (MRB_PROC_CFUNC_P(p)) { if (MRB_PROC_CFUNC_P(p)) {
ci->nregs = argc + 2; ci->nregs = argc + 2;
stack_extend(mrb, ci->nregs, ci->nregs, 0); stack_extend(mrb, ci->nregs, 0, 0);
} }
else { else {
ci->nregs = p->body.irep->nregs + 1; ci->nregs = p->body.irep->nregs + 1;
...@@ -1043,7 +1043,7 @@ RETRY_TRY_BLOCK: ...@@ -1043,7 +1043,7 @@ RETRY_TRY_BLOCK:
ci->nregs = irep->nregs; ci->nregs = irep->nregs;
if (n == CALL_MAXARGS) { if (n == CALL_MAXARGS) {
ci->argc = -1; ci->argc = -1;
stack_extend(mrb, irep->nregs, irep->nlocals, 3); stack_extend(mrb, (irep->nregs < 3) ? 3 : irep->nregs, irep->nlocals, 3);
} }
else { else {
ci->argc = n; ci->argc = n;
...@@ -1107,7 +1107,7 @@ RETRY_TRY_BLOCK: ...@@ -1107,7 +1107,7 @@ RETRY_TRY_BLOCK:
syms = irep->syms; syms = irep->syms;
ci->nregs = irep->nregs; ci->nregs = irep->nregs;
if (ci->argc < 0) { if (ci->argc < 0) {
stack_extend(mrb, irep->nregs, irep->nlocals, 3); stack_extend(mrb, (irep->nregs < 3) ? 3 : irep->nregs, irep->nlocals, 3);
} }
else { else {
stack_extend(mrb, irep->nregs, irep->nlocals, ci->argc+2); stack_extend(mrb, irep->nregs, irep->nlocals, ci->argc+2);
...@@ -1182,7 +1182,7 @@ RETRY_TRY_BLOCK: ...@@ -1182,7 +1182,7 @@ RETRY_TRY_BLOCK:
syms = irep->syms; syms = irep->syms;
ci->nregs = irep->nregs; ci->nregs = irep->nregs;
if (n == CALL_MAXARGS) { if (n == CALL_MAXARGS) {
stack_extend(mrb, irep->nregs, irep->nlocals, 3); stack_extend(mrb, (irep->nregs < 3) ? 3 : irep->nregs, irep->nlocals, 3);
} }
else { else {
stack_extend(mrb, irep->nregs, irep->nlocals, ci->argc+2); stack_extend(mrb, irep->nregs, irep->nlocals, ci->argc+2);
...@@ -1526,7 +1526,7 @@ RETRY_TRY_BLOCK: ...@@ -1526,7 +1526,7 @@ RETRY_TRY_BLOCK:
pool = irep->pool; pool = irep->pool;
syms = irep->syms; syms = irep->syms;
if (ci->argc < 0) { if (ci->argc < 0) {
stack_extend(mrb, irep->nregs, irep->nlocals, 3); stack_extend(mrb, (irep->nregs < 3) ? 3 : irep->nregs, irep->nlocals, 3);
} }
else { else {
stack_extend(mrb, irep->nregs, irep->nlocals, ci->argc+2); stack_extend(mrb, irep->nregs, irep->nlocals, ci->argc+2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment