From 8f487bdc7297042335d7b0bf5dc34213766ca3ab Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Wed, 28 Apr 2021 14:37:21 +0900 Subject: [PATCH] epoch: Correct handling of null ptr returned from alloc::alloc --- crossbeam-epoch/src/atomic.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crossbeam-epoch/src/atomic.rs b/crossbeam-epoch/src/atomic.rs index e4ca23f14..75a4714ef 100644 --- a/crossbeam-epoch/src/atomic.rs +++ b/crossbeam-epoch/src/atomic.rs @@ -252,6 +252,9 @@ impl Pointable for [MaybeUninit] { let align = mem::align_of::>(); let layout = alloc::Layout::from_size_align(size, align).unwrap(); let ptr = alloc::alloc(layout) as *mut Array; + if ptr.is_null() { + alloc::handle_alloc_error(layout); + } (*ptr).size = size; ptr as usize }