mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-07-12 14:18:42 +03:00
Merge branch 'dev' into dev-slice
This commit is contained in:
commit
8f69e7095d
10 changed files with 16 additions and 21 deletions
|
@ -211,7 +211,10 @@ void* _mi_arena_alloc_aligned(size_t size, size_t alignment, bool* commit, bool*
|
|||
}
|
||||
|
||||
// finally, fall back to the OS
|
||||
if (mi_option_is_enabled(mi_option_limit_os_alloc)) return NULL;
|
||||
if (mi_option_is_enabled(mi_option_limit_os_alloc)) {
|
||||
errno = ENOMEM;
|
||||
return NULL;
|
||||
}
|
||||
*is_zero = true;
|
||||
*memid = MI_MEMID_OS;
|
||||
void* p = _mi_os_alloc_aligned(size, alignment, *commit, large, tld->stats);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue