kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-05 23:19:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

move null ptr check

Browse source
This commit is contained in:
Daan 2022-11-06 09:52:54 -08:00
parent f54e64365f
commit d3715132d1
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mimalloc-internal.h
View file

@ -426,8 +426,7 @@ static inline mi_page_t* _mi_get_free_small_page(size_t size) {
// Segment that contains the pointer // Segment that contains the pointer
static inline mi_segment_t* _mi_ptr_segment(const void* p) { static inline mi_segment_t* _mi_ptr_segment(const void* p) {
// mi_assert_internal(p != NULL); mi_assert_internal(p != NULL);
if (p == NULL) return NULL;
return (mi_segment_t*)(((uintptr_t)p - 1) & ~MI_SEGMENT_MASK); return (mi_segment_t*)(((uintptr_t)p - 1) & ~MI_SEGMENT_MASK);
} }

2
src/alloc.c
View file

@ -470,8 +470,8 @@ static inline mi_segment_t* mi_checked_ptr_segment(const void* p, const char* ms
} }
#endif #endif
if mi_unlikely(p == NULL) return NULL;
mi_segment_t* const segment = _mi_ptr_segment(p); mi_segment_t* const segment = _mi_ptr_segment(p);
if mi_unlikely(segment == NULL) return NULL; // checks also for (p==NULL)
#if (MI_DEBUG>0) #if (MI_DEBUG>0)
if mi_unlikely(!mi_is_in_heap_region(p)) { if mi_unlikely(!mi_is_in_heap_region(p)) {