diff --git a/ide/vs2019/mimalloc.vcxproj b/ide/vs2019/mimalloc.vcxproj index 9f967d94..11339def 100644 --- a/ide/vs2019/mimalloc.vcxproj +++ b/ide/vs2019/mimalloc.vcxproj @@ -116,7 +116,7 @@ true true ../../include - MI_DEBUG=3;%(PreprocessorDefinitions); + MI_DEBUG_TRACE=1;MI_DEBUG=3;%(PreprocessorDefinitions); CompileAsCpp false Default diff --git a/src/alloc.c b/src/alloc.c index d7e8aac8..a51d93b1 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -727,7 +727,7 @@ void* _mi_heap_realloc_zero(mi_heap_t* heap, void* p, size_t newsize, bool zero) const size_t start = (size >= sizeof(intptr_t) ? size - sizeof(intptr_t) : 0); memset((uint8_t*)newp + start, 0, newsize - start); } - if (p != NULL) { + if (mi_likely(p != NULL)) { const size_t copysize = (newsize > size ? size : newsize); if (mi_likely(((uintptr_t)p % MI_INTPTR_SIZE) == 0)) { _mi_memcpy_aligned(newp, p, copysize); @@ -735,7 +735,7 @@ void* _mi_heap_realloc_zero(mi_heap_t* heap, void* p, size_t newsize, bool zero) else { _mi_memcpy(newp, p, copysize); } - mi_free(p); // only free the original pointer if successful + mi_free(p); // only free the original pointer if successful } } return newp; diff --git a/test/main-override-static.c b/test/main-override-static.c index 57dc7882..b22e996e 100644 --- a/test/main-override-static.c +++ b/test/main-override-static.c @@ -27,15 +27,15 @@ int main() { mi_version(); mi_stats_reset(); // detect double frees and heap corruption - // double_free1(); + double_free1(); // double_free2(); - double_free3(); - corrupt_free1(); + // double_free3(); + // corrupt_free1(); // corrupt_free2(); // block_overflow1(); // block_overflow2(); // test_aslr(); - // invalid_free(); + invalid_free(); // test_reserved(); // negative_stat(); // alloc_huge();