Ticket #757: TRAC-757-1.patch

src/pmc.c

@@ -675 +675 @@
     const INTVAL type_id = interp->n_vtable_max++;
 
     /* Have we overflowed the table? */
-    if (type_id >= interp->n_vtable_alloced)
+    if (type_id > interp->n_vtable_alloced)
         parrot_realloc_vtables(interp);
 
     return type_id;

src/vtables.c

@@ -129 +129 @@
 parrot_alloc_vtables(PARROT_INTERP)
 {
     ASSERT_ARGS(parrot_alloc_vtables)
+    PARROT_ASSERT(enum_class_core_max <= PARROT_MAX_CLASSES);
+
     interp->vtables          = mem_allocate_n_zeroed_typed(PARROT_MAX_CLASSES, VTABLE *);
     interp->n_vtable_max     = enum_class_core_max;
-    interp->n_vtable_alloced = PARROT_MAX_CLASSES - 1;
+    interp->n_vtable_alloced = PARROT_MAX_CLASSES;
 }
 
 /*
@@ -155 +157 @@
     const INTVAL new_size    = new_max              * sizeof (VTABLE *);
     const INTVAL old_size    = interp->n_vtable_max * sizeof (VTABLE *);
 
-    /* arrays start at zero, but we compare type numbers starting at 1 */
-    interp->n_vtable_alloced = new_max - 1;
+    interp->n_vtable_alloced = new_max;
     interp->vtables          = (VTABLE **)mem_sys_realloc_zeroed(
         interp->vtables, new_size, old_size);
 }

src/pmc/parrotinterpreter.pmc

@@ -80 +80 @@
         d->class_hash   = Parrot_clone(d, s->class_hash);
         d->n_vtable_max = s->n_vtable_max;
 
-        if (d->n_vtable_max > d->n_vtable_alloced)
+        while (d->n_vtable_max > d->n_vtable_alloced)
             parrot_realloc_vtables(d);
 
         last_remove = s->n_vtable_max;