admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fiber stack allocation size should be bigger than irep->nregs

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-07-15 17:17:58 +09:00
parent 472a1c244e
commit d5dd3e9472
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-fiber/src/fiber.c
+9 -4
View File
@@ -69,6 +69,7 @@ fiber_init(mrb_state *mrb, mrb_value self)
struct RProc *p;
mrb_callinfo *ci;
mrb_value blk;
size_t slen;
mrb_get_args(mrb, "&", &blk);
@@ -85,14 +86,18 @@ fiber_init(mrb_state *mrb, mrb_value self)
c = f->cxt;
/* initialize VM stack */
c->stbase = (mrb_value *)mrb_malloc(mrb, FIBER_STACK_INIT_SIZE*sizeof(mrb_value));
c->stend = c->stbase + FIBER_STACK_INIT_SIZE;
slen = FIBER_STACK_INIT_SIZE;
if (p->body.irep->nregs > slen) {
slen += p->body.irep->nregs;
}
c->stbase = (mrb_value *)mrb_malloc(mrb, slen*sizeof(mrb_value));
c->stend = c->stbase + slen;
c->stack = c->stbase;
#ifdef MRB_NAN_BOXING
{
mrb_value *p = c->stbase;
mrb_value *pend = p + FIBER_STACK_INIT_SIZE;
mrb_value *pend = c->stend;
while (p < pend) {
SET_NIL_VALUE(*p);
@@ -100,7 +105,7 @@ fiber_init(mrb_state *mrb, mrb_value self)
}
}
#else
memset(c->stbase, 0, FIBER_STACK_INIT_SIZE * sizeof(mrb_value));
memset(c->stbase, 0, slen * sizeof(mrb_value));
#endif
/* copy receiver from a block */