race condition brutal fix

Inria-Prosecco · Oct 17, 2023 · 1a14aa6 · 1a14aa6
1 parent 60b818b
commit 1a14aa6
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/lib-alloc.c b/src/lib-alloc.c
@@ -24,51 +24,51 @@ uint8_t* StarMalloc_memset_u8(uint8_t* dest, uint8_t v, size_t n) {
 }
 
 void* malloc(size_t size) {
+  pthread_mutex_lock(&m);
   if (! init_status) {
     init_status=1UL;
-    pthread_mutex_lock(&m);
     krmlinit_globals();
-    pthread_mutex_unlock(&m);
   }
+  pthread_mutex_unlock(&m);
   if (thread_arena == N_ARENA) {
     thread_arena = thread_arena_counter++ % N_ARENA;
   }
   return StarMalloc_malloc(thread_arena, size);
 }
 
 void* aligned_alloc(size_t alignment, size_t size) {
+  pthread_mutex_lock(&m);
   if (! init_status) {
-    pthread_mutex_lock(&m);
     krmlinit_globals();
     init_status=1UL;
-    pthread_mutex_unlock(&m);
   }
+  pthread_mutex_unlock(&m);
   if (thread_arena == N_ARENA) {
     thread_arena = thread_arena_counter++ % N_ARENA;
   }
   return StarMalloc_aligned_alloc(thread_arena, alignment, size);
 }
 
 void free(void *ptr) {
+  pthread_mutex_lock(&m);
   if (! init_status) {
-    pthread_mutex_lock(&m);
     krmlinit_globals();
     init_status=1UL;
-    pthread_mutex_unlock(&m);
   }
+  pthread_mutex_unlock(&m);
   //printf("free ptr: %p\n", ptr);
   bool b = StarMalloc_free(ptr);
   //printf("  result: %b\n");
   return;
 }
 
 void* realloc(void* ptr, size_t new_size) {
+  pthread_mutex_lock(&m);
   if (! init_status) {
-    pthread_mutex_lock(&m);
     krmlinit_globals();
     init_status=1UL;
-    pthread_mutex_unlock(&m);
   }
+  pthread_mutex_unlock(&m);
   if (thread_arena == N_ARENA) {
     thread_arena = thread_arena_counter++ % N_ARENA;
   }
@@ -79,12 +79,12 @@ void* realloc(void* ptr, size_t new_size) {
 }
 
 void* calloc(size_t nb_elem, size_t size_elem) {
+  pthread_mutex_lock(&m);
   if (! init_status) {
-    pthread_mutex_lock(&m);
     krmlinit_globals();
     init_status=1UL;
-    pthread_mutex_unlock(&m);
   }
+  pthread_mutex_unlock(&m);
   if (thread_arena == N_ARENA) {
     thread_arena = thread_arena_counter++ % N_ARENA;
   }
@@ -93,11 +93,11 @@ void* calloc(size_t nb_elem, size_t size_elem) {
 }
 
 size_t malloc_usable_size(void* ptr) {
+  pthread_mutex_lock(&m);
   if (! init_status) {
-    pthread_mutex_lock(&m);
     krmlinit_globals();
     init_status=1UL;
-    pthread_mutex_unlock(&m);
   }
+  pthread_mutex_unlock(&m);
   return StarMalloc_getsize(ptr);
 }