From 194e0bd7e47a9e7a73597c218ffc3f04a50e8e48 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 29 Aug 2012 18:12:28 +0200 Subject: QDBusIntegrator: fix unprotected QDBusPendingCallPrivate::waitingForFinished call There probably is a happens-before relation to all the writes of the bool elsewhere, but the comment in QDBusPendingCallPrivate says waitingForFinsihed is one of the variables protected by the mutex, so don't make every reader of the code re-establish the safety (if indeed, it is safe) oneself again, but just wrap the access in a mutex lock. To be able to compile the mutex locking out of release builds, wrap the access in a function. Make the function static _inline_ so compilers won't complain about it being unused in release builds. Change-Id: I914ce91e64e776450c697a3243b35716390a218c Reviewed-by: Thiago Macieira --- src/dbus/qdbusintegrator.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 231e973106..eada7b7792 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1779,6 +1779,12 @@ void QDBusConnectionPrivate::waitForFinished(QDBusPendingCallPrivate *pcall) } } +static inline bool waitingForFinishedIsSet(QDBusPendingCallPrivate *call) +{ + const QMutexLocker locker(&call->mutex); + return call->waitingForFinished; +} + void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call) { QDBusConnectionPrivate *connection = const_cast(call->connection); @@ -1828,7 +1834,7 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call) emit connection->callWithCallbackFailed(QDBusError(msg), call->sentMessage); if (call->autoDelete) { - Q_ASSERT(!call->waitingForFinished); // can't wait on a call with autoDelete! + Q_ASSERT(!waitingForFinishedIsSet(call)); // can't wait on a call with autoDelete! delete call; } } -- cgit v1.2.3