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

force room in arena before raising arena overflow error

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-05-29 22:14:32 +09:00
parent 836fed4c33
commit 42b4060c9d
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gc.c
+4 -15
View File
@@ -261,21 +261,10 @@ mrb_obj_alloc(mrb_state *mrb, enum mrb_vtype ttype, struct RClass *cls)
}
mrb->live++;
if (mrb->arena_idx > MRB_ARENA_SIZE - 4) {
struct RBasic **p, **q, **e;
p = q = mrb->arena;
e = p + mrb->arena_idx;
while (p < e) {
if (is_white(*p))
*q++ = *p;
p++;
}
if (p == q) {
/* arena overflow error */
mrb_raise(mrb, E_TYPE_ERROR, "arena overflow error");
}
mrb->arena_idx = q - mrb->arena;
if (mrb->arena_idx > MRB_ARENA_SIZE) {
/* arena overflow error */
mrb->arena_idx = MRB_ARENA_SIZE - 2; /* force room in arena */
mrb_raise(mrb, mrb->eRuntimeError_class, "arena overflow error");
}
mrb->arena[mrb->arena_idx++] = p;
memset(p, 0, sizeof(RVALUE));