| # Licensed to the Apache Software Foundation (ASF) under one |
| # or more contributor license agreements. See the NOTICE file |
| # distributed with this work for additional information |
| # regarding copyright ownership. The ASF licenses this file |
| # to you under the Apache License, Version 2.0 (the |
| # "License"); you may not use this file except in compliance |
| # with the License. You may obtain a copy of the License at |
| # |
| # http://www.apache.org/licenses/LICENSE-2.0 |
| # |
| # Unless required by applicable law or agreed to in writing, |
| # software distributed under the License is distributed on an |
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| # KIND, either express or implied. See the License for the |
| # specific language governing permissions and limitations |
| # under the License. |
| |
| Fix for https://github.com/microsoft/mimalloc/issues/1138 |
| |
| diff --git a/src/arena.c b/src/arena.c |
| index b26f4442..d7e99b55 100644 |
| --- a/src/arena.c |
| +++ b/src/arena.c |
| @@ -797,6 +797,9 @@ mi_page_t* _mi_arenas_page_alloc(mi_heap_t* heap, size_t block_size, size_t bloc |
| else { |
| page = mi_arenas_page_singleton_alloc(heap, block_size, block_alignment); |
| } |
| + if mi_unlikely(page == NULL) { |
| + return NULL; |
| + } |
| // mi_assert_internal(page == NULL || _mi_page_segment(page)->subproc == tld->subproc); |
| mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN)); |
| mi_assert_internal(_mi_ptr_page(page)==page); |