summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gc.c6
-rw-r--r--src/state.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gc.c b/src/gc.c
index 9286f361b..9a45049d2 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -587,8 +587,10 @@ root_scan_phase(mrb_state *mrb)
mrb_gc_mark(mrb, (struct RBasic*)ci->target_class);
}
/* mark irep pool */
- for (i=0; i<mrb->irep_len; i++) {
- if (mrb->irep) {
+ if (mrb->irep) {
+ size_t len = mrb->irep_len;
+ if (len > mrb->irep_capa) len = mrb->irep_capa;
+ for (i=0; i<len; i++) {
mrb_irep *irep = mrb->irep[i];
if (!irep) continue;
for (j=0; j<irep->plen; j++) {
diff --git a/src/state.c b/src/state.c
index 6d34381ba..fb2bebe92 100644
--- a/src/state.c
+++ b/src/state.c
@@ -83,10 +83,12 @@ mrb_add_irep(mrb_state *mrb, int idx)
mrb->irep_capa = max;
}
else if (mrb->irep_capa <= idx) {
+ size_t old_capa = mrb->irep_capa;
while (mrb->irep_capa <= idx) {
mrb->irep_capa *= 2;
}
mrb->irep = (mrb_irep **)mrb_realloc(mrb, mrb->irep, sizeof(mrb_irep*)*mrb->irep_capa);
+ memset(mrb->irep + old_capa, 0, sizeof(mrb_irep*) * (mrb->irep_capa - old_capa));
}
}