kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-07-01 17:24:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix error path on commit failure to use correct base address

Browse source
This commit is contained in:
Daan 2025-06-03 13:56:12 -07:00
parent 6454abb02b
commit bea8a12d3d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/os.c
View file

@ -280,19 +280,19 @@ static void* mi_os_prim_alloc_aligned(size_t size, size_t alignment, bool commit
p = mi_os_prim_alloc(over_size, 1 /*alignment*/, false /* commit? */, false /* allow_large */, is_large, is_zero); p = mi_os_prim_alloc(over_size, 1 /*alignment*/, false /* commit? */, false /* allow_large */, is_large, is_zero);
if (p == NULL) return NULL; if (p == NULL) return NULL;
// set p to the aligned part in the full region
// note: on Windows VirtualFree needs the actual base pointer
// this is handledby having the `base` field in the memid.
*base = p; // remember the base
p = _mi_align_up_ptr(p, alignment);
// explicitly commit only the aligned part // explicitly commit only the aligned part
void* const aligned_p = _mi_align_up_ptr(p, alignment);
if (commit) { if (commit) {
if (!_mi_os_commit(p, size, NULL)) { if (!_mi_os_commit(aligned_p, size, NULL)) {
mi_os_prim_free(p, over_size, 0); mi_os_prim_free(p, over_size, 0);
return NULL; return NULL;
} }
} }
// note: on Windows VirtualFree needs the actual base pointer
// this is handled by having the `base` field in the memid.
*base = p;
p = aligned_p;
} }
else { // mmap can free inside an allocation else { // mmap can free inside an allocation
// overallocate... // overallocate...
@ -300,7 +300,7 @@ static void* mi_os_prim_alloc_aligned(size_t size, size_t alignment, bool commit
if (p == NULL) return NULL; if (p == NULL) return NULL;
// and selectively unmap parts around the over-allocated area. // and selectively unmap parts around the over-allocated area.
void* aligned_p = _mi_align_up_ptr(p, alignment); void* const aligned_p = _mi_align_up_ptr(p, alignment);
size_t pre_size = (uint8_t*)aligned_p - (uint8_t*)p; size_t pre_size = (uint8_t*)aligned_p - (uint8_t*)p;
size_t mid_size = _mi_align_up(size, _mi_os_page_size()); size_t mid_size = _mi_align_up(size, _mi_os_page_size());
size_t post_size = over_size - pre_size - mid_size; size_t post_size = over_size - pre_size - mid_size;