void *p;
size_t size;
- /* Calculate block size. */
+ /* Calculate block size and make sure it fits in size_t. */
size = a * b;
if (size < a || size < b)
return NULL;
}
#ifndef NDEBUG
- memset (b, 0xcd, d->block_size);
+ memset (b, 0xcc, d->block_size);
#endif
lock_acquire (&d->lock);
block_to_arena (struct block *b)
{
struct arena *a = pg_round_down (b);
+
+ /* Check that the arena is valid. */
ASSERT (a != NULL);
ASSERT (a->magic == ARENA_MAGIC);
+
+ /* Check that the block is properly aligned for the arena. */
+ ASSERT (a->desc == NULL
+ || (pg_ofs (b) - sizeof *a) % a->desc->block_size == 0);
+ ASSERT (a->desc != NULL || pg_ofs (b) == sizeof *a);
+
return a;
}