fix merge conflict

This commit is contained in:
Daan 2025-05-21 15:28:52 -07:00
parent ed474ce525
commit 0c62893367
2 changed files with 4 additions and 5 deletions

View file

@ -86,9 +86,12 @@ int main(void) {
CHECK_BODY("malloc-nomem1") {
result = (mi_malloc((size_t)PTRDIFF_MAX + (size_t)1) == NULL);
};
CHECK_BODY("malloc-null") {
CHECK_BODY("malloc-free-null") {
mi_free(NULL);
};
CHECK_BODY("malloc-free-invalid-low") {
mi_free((void*)(MI_ZU(0x0000000003990080))); // issue #1087
};
CHECK_BODY("calloc-overflow") {
// use (size_t)&mi_calloc to get some number without triggering compiler warnings
result = (mi_calloc((size_t)&mi_calloc,SIZE_MAX/1000) == NULL);