Remove bailout again and always ask for at least as many bytes as the…

… requested alignment
rusterlium · Mar 15, 2024 · cb6cd23 · cb6cd23
1 parent 9f46b13
commit cb6cd23
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/rustler/src/alloc.rs b/rustler/src/alloc.rs
@@ -11,10 +11,7 @@ pub struct EnifAllocator;
 unsafe impl GlobalAlloc for EnifAllocator {
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
         // TODO: Check enif_alloc's real alignment
-        if layout.align() > (((((layout.size()) - 1) / 8) + 1) * 8) {
-            return std::ptr::null_mut();
-        }
-        rustler_sys::enif_alloc(layout.size()) as *mut u8
+        rustler_sys::enif_alloc(layout.size().max(layout.align())) as *mut u8
     }
 
     unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {