1 files changed, 8 insertions, 6 deletions

diff --git a/mem/src/mem.c b/mem/src/mem.c
index 4f5e5ef..9169a9f 100644
--- a/mem/src/mem.c
+++ b/mem/src/mem.c
@@ -46,17 +46,18 @@ void mem_del_(Memory* mem) {
   if (mem->dynamic) {
     if (mem->chunks) {
       free(mem->chunks);
-      mem->chunks = 0;
+      mem->chunks = nullptr;
     }
     if (mem->blocks) {
       free(mem->blocks);
-      mem->blocks = 0;
+      mem->blocks = nullptr;
     }
   }
 }
 
 void mem_clear_(Memory* mem) {
   assert(mem);
+  mem->num_used_blocks = 0;
   mem->next_free_chunk = 0;
   memset(mem->blocks, 0, mem->num_blocks * mem->block_size_bytes);
   memset(mem->chunks, 0, mem->num_blocks * sizeof(Chunk));
@@ -113,10 +114,11 @@ void* mem_alloc_(Memory* mem, size_t num_blocks) {
     return &mem->blocks[chunk_idx * mem->block_size_bytes];
   } else {
     if (mem->trap) {
-      FAIL("Memory allocation failed, increase the allocator's capacity or "
-           "avoid fragmentation.");
+      FAIL(
+          "Memory allocation failed, increase the allocator's capacity or "
+          "avoid fragmentation.");
     }
-    return 0; // Large-enough free chunk not found.
+    return nullptr; // Large-enough free chunk not found.
   }
 }
 
@@ -172,7 +174,7 @@ void mem_free_(Memory* mem, void** chunk_ptr) {
 
   mem->num_used_blocks--;
 
-  *chunk_ptr = 0;
+  *chunk_ptr = nullptr;
 }
 
 // The handle is the chunk's index. We don't call it an index in the public API