1 files changed, 9 insertions, 3 deletions

diff --git a/rsnix/src/memory.rs b/rsnix/src/memory.rs
index 7c3eda0..e03af8b 100644
--- a/rsnix/src/memory.rs
+++ b/rsnix/src/memory.rs
@@ -458,7 +458,9 @@ pub fn self_test() -> bool {
             seed = seed.wrapping_mul(6364136223846793005).wrapping_add(1);
             let align = 16usize << (seed as usize % 8);
             seed = seed.wrapping_mul(6364136223846793005).wrapping_add(1);
-            let layout = Layout::from_size_align(size, align).unwrap();
+            let Ok(layout) = Layout::from_size_align(size, align) else {
+                return false; // impossible: size <= 2048, align <= 2048
+            };
             let p = ALLOCATOR.alloc(layout);
             if p.is_null() {
                 break; // heap exhausted — stop
@@ -493,7 +495,9 @@ pub fn self_test() -> bool {
             seed = seed.wrapping_mul(6364136223846793005).wrapping_add(1);
             let align = 16usize << (seed as usize % 8);
             seed = seed.wrapping_mul(6364136223846793005).wrapping_add(1);
-            let layout = Layout::from_size_align(size, align).unwrap();
+            let Ok(layout) = Layout::from_size_align(size, align) else {
+                return false; // impossible: size <= 2048, align <= 2048
+            };
             let p = ALLOCATOR.alloc(layout);
             if p.is_null() {
                 return false; // failed to reuse freed space
@@ -510,7 +514,9 @@ pub fn self_test() -> bool {
             if *ptr == 0 {
                 continue;
             }
-            let layout = Layout::from_size_align(*size, *align).unwrap();
+            let Ok(layout) = Layout::from_size_align(*size, *align) else {
+                return false; // impossible: sizes/aligns came from the loop above
+            };
             ALLOCATOR.dealloc(*ptr as *mut u8, layout);
         }
         let stats = heap_stats();