diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-06-06 15:46:18 +0200 |
|---|---|---|
| committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2017-06-06 20:26:23 +0000 |
| commit | e400b7e326c554ccd819448866265953d2a0f24d (patch) | |
| tree | 5666327e951fa59d97f515745accc2eb001caf94 | |
| parent | 5b24f0a6bb5a670539ed6ad94a9359378203b6da (diff) | |
Ensure QDBusConnectionPrivate pointer initialization
Change-Id: Id7ca5b412462b5d7a18d12f9a227fdf9ef7b2344
Coverity-Id: 180869
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/dbus/qdbusserver.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index b1f9be2c2a..ce55297abb 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE \a parent. */ QDBusServer::QDBusServer(const QString &address, QObject *parent) - : QObject(parent), d(0) + : QObject(parent), d(nullptr) { if (address.isEmpty()) return; @@ -83,7 +83,7 @@ QDBusServer::QDBusServer(const QString &address, QObject *parent) localhost (elsewhere). */ QDBusServer::QDBusServer(QObject *parent) - : QObject(parent) + : QObject(parent), d(nullptr) { #ifdef Q_OS_UNIX // Use Unix sockets on Unix systems only @@ -92,10 +92,8 @@ QDBusServer::QDBusServer(QObject *parent) const QString address = QStringLiteral("tcp:"); #endif - if (!qdbus_loadLibDBus()) { - d = 0; + if (!qdbus_loadLibDBus()) return; - } QDBusConnectionManager *instance = QDBusConnectionManager::instance(); if (!instance) |