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

static analysis fixes

Browse source
This commit is contained in:
Eric Budai 2019-08-10 09:42:42 -04:00
parent 70648635c6
commit b342264867
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/alloc-aligned.c
View file

@ -71,7 +71,7 @@ void* mi_heap_zalloc_aligned(mi_heap_t* heap, size_t size, size_t alignment) mi_
void* mi_heap_calloc_aligned_at(mi_heap_t* heap, size_t count, size_t size, size_t alignment, size_t offset) mi_attr_noexcept { void* mi_heap_calloc_aligned_at(mi_heap_t* heap, size_t count, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
size_t total; size_t total;
if (mi_mul_overflow(count, size, &total)) return NULL; if (mi_mul_overflow(size, count, &total)) return NULL;
return mi_heap_zalloc_aligned_at(heap, total, alignment, offset); return mi_heap_zalloc_aligned_at(heap, total, alignment, offset);
} }

8
src/alloc.c
View file

@ -322,7 +322,7 @@ void mi_free_aligned(void* p, size_t alignment) mi_attr_noexcept {
extern inline void* mi_heap_calloc(mi_heap_t* heap, size_t count, size_t size) mi_attr_noexcept { extern inline void* mi_heap_calloc(mi_heap_t* heap, size_t count, size_t size) mi_attr_noexcept {
size_t total; size_t total;
if (mi_mul_overflow(count,size,&total)) return NULL; if (mi_mul_overflow(size,count,&total)) return NULL;
return mi_heap_zalloc(heap,total); return mi_heap_zalloc(heap,total);
} }
@ -333,7 +333,7 @@ void* mi_calloc(size_t count, size_t size) mi_attr_noexcept {
// Uninitialized `calloc` // Uninitialized `calloc`
extern void* mi_heap_mallocn(mi_heap_t* heap, size_t count, size_t size) mi_attr_noexcept { extern void* mi_heap_mallocn(mi_heap_t* heap, size_t count, size_t size) mi_attr_noexcept {
size_t total; size_t total;
if (mi_mul_overflow(count,size,&total)) return NULL; if (mi_mul_overflow(size,count,&total)) return NULL;
return mi_heap_malloc(heap, total); return mi_heap_malloc(heap, total);
} }
@ -374,7 +374,7 @@ void* mi_heap_realloc(mi_heap_t* heap, void* p, size_t newsize) mi_attr_noexcept
void* mi_heap_reallocn(mi_heap_t* heap, void* p, size_t count, size_t size) mi_attr_noexcept { void* mi_heap_reallocn(mi_heap_t* heap, void* p, size_t count, size_t size) mi_attr_noexcept {
size_t total; size_t total;
if (mi_mul_overflow(count, size, &total)) return NULL; if (mi_mul_overflow(size, count, &total)) return NULL;
return mi_heap_realloc(heap, p, total); return mi_heap_realloc(heap, p, total);
} }
@ -392,7 +392,7 @@ void* mi_realloc(void* p, size_t newsize) mi_attr_noexcept {
void* mi_recalloc(void* p, size_t count, size_t size) mi_attr_noexcept { void* mi_recalloc(void* p, size_t count, size_t size) mi_attr_noexcept {
size_t total; size_t total;
if (mi_mul_overflow(count, size, &total)) return NULL; if (mi_mul_overflow(size, count, &total)) return NULL;
return _mi_heap_realloc_zero(mi_get_default_heap(),p,total,true); return _mi_heap_realloc_zero(mi_get_default_heap(),p,total,true);
} }

2
src/page.c
View file

@ -142,7 +142,7 @@ static void mi_page_thread_free_collect(mi_page_t* page)
mi_thread_free_t tfree; mi_thread_free_t tfree;
mi_thread_free_t tfreex; mi_thread_free_t tfreex;
do { do {
tfreex = tfree = page->thread_free; tfree = page->thread_free;
head = mi_tf_block(tfree); head = mi_tf_block(tfree);
tfreex = mi_tf_set_block(tfree,NULL); tfreex = mi_tf_set_block(tfree,NULL);
} while (!mi_atomic_compare_exchange((volatile uintptr_t*)&page->thread_free, tfreex, tfree)); } while (!mi_atomic_compare_exchange((volatile uintptr_t*)&page->thread_free, tfreex, tfree));