From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 14 Jul 2011 16:26:52 +0000 (+0100)
Subject: dbus-memory: use atomic accesses to block count, even for assertions
X-Git-Tag: dbus-1.4.14~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef0f6ec93550560992b516ab1ae0ac30c0e2d8e6;p=thirdparty%2Fdbus.git

dbus-memory: use atomic accesses to block count, even for assertions

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005
---

diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index a37759c0f..ee40e82b1 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -295,7 +295,7 @@ _dbus_decrement_fail_alloc_counter (void)
 int
 _dbus_get_malloc_blocks_outstanding (void)
 {
-  return n_blocks_outstanding.value;
+  return _dbus_atomic_get (&n_blocks_outstanding);
 }
 
 /**
@@ -634,10 +634,15 @@ dbus_free (void  *memory)
       check_guards (memory, TRUE);
       if (memory)
         {
-	  _dbus_atomic_dec (&n_blocks_outstanding);
-          
-	  _dbus_assert (n_blocks_outstanding.value >= 0);
-          
+#ifdef DBUS_DISABLE_ASSERT
+          _dbus_atomic_dec (&n_blocks_outstanding);
+#else
+          dbus_int32_t old_value;
+
+          old_value = _dbus_atomic_dec (&n_blocks_outstanding);
+          _dbus_assert (old_value >= 1);
+#endif
+
           free (((unsigned char*)memory) - GUARD_START_OFFSET);
         }
       
@@ -648,9 +653,14 @@ dbus_free (void  *memory)
   if (memory) /* we guarantee it's safe to free (NULL) */
     {
 #ifdef DBUS_BUILD_TESTS
+#ifdef DBUS_DISABLE_ASSERT
       _dbus_atomic_dec (&n_blocks_outstanding);
-      
-      _dbus_assert (n_blocks_outstanding.value >= 0);
+#else
+      dbus_int32_t old_value;
+
+      old_value = _dbus_atomic_dec (&n_blocks_outstanding);
+      _dbus_assert (old_value >= 1);
+#endif
 #endif
 
       free (memory);