diff --git a/src/region.c b/src/region.c index fa51c298..aa4f95b5 100644 --- a/src/region.c +++ b/src/region.c @@ -298,12 +298,12 @@ static void* mi_region_try_alloc(size_t blocks, bool* commit, bool* is_large, bo if (any_uncommitted) { mi_assert_internal(!info.x.is_large); bool commit_zero = false; - bool ok = _mi_mem_commit(p, blocks * MI_SEGMENT_SIZE, &commit_zero, tld); - if (commit_zero) *is_zero = true; - if (!ok) - { + if (!_mi_mem_commit(p, blocks * MI_SEGMENT_SIZE, &commit_zero, tld)) { + // failed to commit! unclaim and return + mi_bitmap_unclaim(®ion->in_use, 1, blocks, bit_idx); return NULL; } + if (commit_zero) *is_zero = true; } } else { diff --git a/src/segment.c b/src/segment.c index 35fc3ba7..0daf8ddb 100644 --- a/src/segment.c +++ b/src/segment.c @@ -207,14 +207,16 @@ static void mi_segment_protect(mi_segment_t* segment, bool protect, mi_os_tld_t* mi_assert_internal(MI_SECURE <= 1 || segment->page_kind >= MI_PAGE_LARGE); uint8_t* start = (uint8_t*)segment + segment->segment_size - os_psize; if (protect && !segment->mem_is_committed) { - // ensure secure page is committed -#if (MI_DEBUG>1) - bool ok = -#endif - _mi_mem_commit(start, os_psize, NULL, tld); - mi_assert_internal(ok); + if (protect) { + // ensure secure page is committed + if (_mi_mem_commit(start, os_psize, NULL, tld)) { // if this fails that is ok (as it is an unaccessible page) + mi_segment_protect_range(start, os_psize, protect); + } + } + } + else { + mi_segment_protect_range(start, os_psize, protect); } - mi_segment_protect_range(start, os_psize, protect); } else { // or protect every page