From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 3 Jan 2023 13:29:14 +0000 (+0100)
Subject: Fix data race in multithreaded application
X-Git-Tag: dbus-1.15.4~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1741df3b977001aee6bee7c7458ed786c60c8eb7;p=thirdparty%2Fdbus.git

Fix data race in multithreaded application

This commit fixes a data race condition discovered by the
gcc thread sanitizer by also locking the associated mutex
when reading the corresponding counter.

Fixes #426
---

diff --git a/dbus/dbus-resources.c b/dbus/dbus-resources.c
index 782cb4528..7e1c3e55a 100644
--- a/dbus/dbus-resources.c
+++ b/dbus/dbus-resources.c
@@ -275,7 +275,11 @@ _dbus_counter_adjust_unix_fd (DBusCounter *counter,
 long
 _dbus_counter_get_size_value (DBusCounter *counter)
 {
-  return counter->size_value;
+  long result;
+  _dbus_rmutex_lock (counter->mutex);
+  result = counter->size_value;
+  _dbus_rmutex_unlock (counter->mutex);
+  return result;
 }
 
 /**
@@ -287,7 +291,11 @@ _dbus_counter_get_size_value (DBusCounter *counter)
 long
 _dbus_counter_get_unix_fd_value (DBusCounter *counter)
 {
-  return counter->unix_fd_value;
+  long result;
+  _dbus_rmutex_lock (counter->mutex);
+  result = counter->unix_fd_value;
+  _dbus_rmutex_unlock (counter->mutex);
+  return result;
 }
 
 /**