1 files changed, 6 insertions, 1 deletions

diff --git a/rsnix/src/memory.rs b/rsnix/src/memory.rs
index d33c781..c80edab 100644
--- a/rsnix/src/memory.rs
+++ b/rsnix/src/memory.rs
@@ -436,6 +436,11 @@ pub fn heap_stats() -> HeapStats {
 /// the heap itself (fixed-size stack arrays only).  Returns true on success.
 pub fn self_test() -> bool {
     unsafe {
+        // Snapshot the heap before we start: earlier boot code (e.g. the
+        // vt cell grids) may legitimately hold live allocations.  The test
+        // must return the heap to exactly this state, not to "empty".
+        let before = heap_stats();
+
         const N: usize = 128;
         // (ptr, size, align) triplets — fixed array on the stack.
         let mut blocks: [(usize, usize, usize); N] = [(0, 0, 0); N];
@@ -504,7 +509,7 @@ pub fn self_test() -> bool {
             ALLOCATOR.dealloc(*ptr as *mut u8, layout);
         }
         let stats = heap_stats();
-        stats.free_blocks == 1 && stats.free_bytes == stats.heap_size
+        stats.free_blocks == before.free_blocks && stats.free_bytes == before.free_bytes
     }
 }