Merge #690

690: epoch: Correct handling of null ptr returned from alloc::alloc r=jeehoonkang a=taiki-e Fixes #689 Co-authored-by: Taiki Endo <[email protected]>
crossbeam-rs · Apr 28, 2021 · 93dce5a · 93dce5a
2 parents 7928d11 + 8f487bd
commit 93dce5a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/crossbeam-epoch/src/atomic.rs b/crossbeam-epoch/src/atomic.rs
@@ -252,6 +252,9 @@ impl<T> Pointable for [MaybeUninit<T>] {
         let align = mem::align_of::<Array<T>>();
         let layout = alloc::Layout::from_size_align(size, align).unwrap();
         let ptr = alloc::alloc(layout) as *mut Array<T>;
+        if ptr.is_null() {
+            alloc::handle_alloc_error(layout);
+        }
         (*ptr).size = size;
         ptr as usize
     }