X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fmalloc.c;h=20773548d9ee2499b68a22e89e3b222694ef985c;hb=691750d03ff70aa5cef5fba81fed82e3a941bf95;hp=487e93875ef4124ac314a7355429d4c2a632d1ab;hpb=8382bdd7884a6d38f7529e0517dd9a7083f4ce73;p=pintos-anon

diff --git a/src/threads/malloc.c b/src/threads/malloc.c
index 487e938..2077354 100644
--- a/src/threads/malloc.c
+++ b/src/threads/malloc.c
@@ -228,8 +228,16 @@ static struct arena *
 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;
 }