AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtDBus: Check if QDBusServer is destroyed before accessing it

Browse Source 
Also lock before accessing serverObject member, it is cleared
by ~QDBusServer().

Task-number: QTBUG-116621
Change-Id: I14c96e34316a46fe43ecd929e44cd1800ba8b803
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ievgenii Meshcheriakov 2023-09-08 16:26:23 +02:00
parent 2156778184
commit eacff46af4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbus/qdbusintegrator.cpp
View File

@ -313,6 +313,10 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v
newConnection->setPeer(connection, error);
newConnection->setDispatchEnabled(false);
QReadLocker serverLock(&serverConnection->lock);
if (!serverConnection->serverObject)
return;
// this is a queued connection and will resume in the QDBusServer's thread
QMetaObject::invokeMethod(serverConnection->serverObject, &QDBusServer::newConnection,
Qt::QueuedConnection, QDBusConnectionPrivate::q(newConnection));
@ -321,7 +325,7 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v
// QDBusServer's thread in order to enable it after the
// QDBusServer::newConnection() signal has been received by the
// application's code
QReadLocker serverLock(&serverConnection->lock);
newConnection->enableDispatchDelayed(serverConnection->serverObject);
}