Merge pull request #371 from ldorau/Fix_make_umf_ba_linear_alloc0_always_return_NULL

Fix: make umf_ba_linear_alloc(0) always return NULL

Author: bratpiorka

src/base_alloc/base_alloc_linear.c

@@ -118,6 +118,9 @@ umf_ba_linear_pool_t *umf_ba_linear_create(size_t pool_size) {
 }
 
 void *umf_ba_linear_alloc(umf_ba_linear_pool_t *pool, size_t size) {
+    if (size == 0) {
+        return NULL;
+    }
     size_t aligned_size = ALIGN_UP(size, MEMORY_ALIGNMENT);
     util_mutex_lock(&pool->metadata.lock);
     if (pool->metadata.size_left < aligned_size) {
@@ -248,14 +251,7 @@ void umf_ba_linear_destroy(umf_ba_linear_pool_t *pool) {
     if (pool->metadata.global_n_allocs) {
         fprintf(stderr, "umf_ba_linear_destroy(): global_n_allocs = %zu\n",
                 pool->metadata.global_n_allocs);
-        // This assert fails sporadically on Windows only.
-        // TODO: fix this issue and uncomment this assert
-        // It is safe to comment it out temporarily,
-        // because the linear base allocator is used
-        // in the proxy library only but umf_ba_linear_destroy()
-        // is skipped, so this code is never run in real life.
-        //
-        // assert(pool->metadata.global_n_allocs == 0);
+        assert(pool->metadata.global_n_allocs == 0);
     }
 #endif /* NDEBUG */
 

test/test_base_alloc_linear.cpp

@@ -73,10 +73,11 @@ TEST_F(test, baseAllocLinearMultiThreadedAllocMemset) {
         } buffer[ITERATIONS];
 
         for (int i = 0; i < ITERATIONS; i++) {
-            buffer[i].size =
-                (size_t)((rand() / (double)RAND_MAX) * MAX_ALLOCATION_SIZE);
-            buffer[i].ptr =
-                (unsigned char *)umf_ba_linear_alloc(pool, buffer[i].size);
+            // size must be greater than 0
+            size_t size = (size_t)(1 + (MAX_ALLOCATION_SIZE - 1) *
+                                           (rand() / (double)RAND_MAX));
+            buffer[i].size = size;
+            buffer[i].ptr = (unsigned char *)umf_ba_linear_alloc(pool, size);
             UT_ASSERTne(buffer[i].ptr, NULL);
             memset(buffer[i].ptr, (i + TID) & 0xFF, buffer[i].size);
         }