From bf9c3bd08847e7dc1972db52b419b21171bc6c6e Mon Sep 17 00:00:00 2001 From: Igor Kostenko Date: Mon, 14 Sep 2020 10:50:22 +0100 Subject: [PATCH] Fix rare access violation on out of memory --- src/region.c | 8 ++++++-- src/segment.c | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/region.c b/src/region.c index bebc29f..fa51c29 100644 --- a/src/region.c +++ b/src/region.c @@ -297,9 +297,13 @@ static void* mi_region_try_alloc(size_t blocks, bool* commit, bool* is_large, bo mi_bitmap_claim(®ion->commit, 1, blocks, bit_idx, &any_uncommitted); if (any_uncommitted) { mi_assert_internal(!info.x.is_large); - bool commit_zero; - _mi_mem_commit(p, blocks * MI_SEGMENT_SIZE, &commit_zero, tld); + 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) + { + return NULL; + } } } else { diff --git a/src/segment.c b/src/segment.c index a507771..35fc3ba 100644 --- a/src/segment.c +++ b/src/segment.c @@ -208,7 +208,11 @@ static void mi_segment_protect(mi_segment_t* segment, bool protect, mi_os_tld_t* 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); } mi_segment_protect_range(start, os_psize, protect); } @@ -606,8 +610,11 @@ static mi_segment_t* mi_segment_init(mi_segment_t* segment, size_t required, mi_ // ensure the initial info is committed if (segment->capacity < capacity) { bool commit_zero = false; - _mi_mem_commit(segment, pre_size, &commit_zero, tld->os); + bool ok = _mi_mem_commit(segment, pre_size, &commit_zero, tld->os); if (commit_zero) is_zero = true; + if (!ok) { + return NULL; + } } } }