merge from dev

This commit is contained in:
daan 2020-05-19 10:44:48 -07:00
parent bb6e8616ff
commit 25ee3a5373

View File

@ -245,7 +245,7 @@ static bool mi_page_unreset(mi_segment_t* segment, mi_page_t* page, size_t size,
mi_assert_internal(page->is_reset); mi_assert_internal(page->is_reset);
mi_assert_internal(page->is_committed); mi_assert_internal(page->is_committed);
mi_assert_internal(!segment->mem_is_fixed); mi_assert_internal(!segment->mem_is_fixed);
if (segment->mem_is_fixed || !page->is_committed || !page->is_reset) return; if (segment->mem_is_fixed || !page->is_committed || !page->is_reset) return true;
page->is_reset = false; page->is_reset = false;
size_t psize; size_t psize;
uint8_t* start = mi_segment_raw_page_start(segment, page, &psize); uint8_t* start = mi_segment_raw_page_start(segment, page, &psize);