From 845ee678cf3a64235c8c8f14bcb9c49e43c8f60a Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 26 Aug 2016 17:30:26 +0200
Subject: [PATCH] the order of atexit() seem to be different on FreeBSD

---
 src/xbt/mallocator.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c
index 295ea55dfa..f898c39e80 100644
--- a/src/xbt/mallocator.c
+++ b/src/xbt/mallocator.c
@@ -196,6 +196,8 @@ void *xbt_mallocator_get(xbt_mallocator_t m)
  */
 void xbt_mallocator_release(xbt_mallocator_t m, void *object)
 {
+  if (m == NULL) // The mallocators are already destroyed. Bail out ASAP.
+     return;
   if (m->objects != NULL) { // Go for it
     lock_acquire(m);
     if (m->current_size < m->max_size) {
-- 
2.20.1