From c401506ffc33053c4fe8b0e5ff492361653be12a Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 27 Sep 2015 12:00:01 -0700
Subject: QDBusServer: Fix uninitialized member

If you used the QString constructor overload and passed an empty
address, the d pointer would remain uninitialized.

Found by Coverity, CID 11724.

Change-Id: I42e7ef1a481840699a8dffff1407ead3ee703d6e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
---
 src/dbus/qdbusserver.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/dbus/qdbusserver.cpp')

diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
index 6c1b4c10ef..babb270da0 100644
--- a/src/dbus/qdbusserver.cpp
+++ b/src/dbus/qdbusserver.cpp
@@ -54,15 +54,13 @@ QT_BEGIN_NAMESPACE
     \a parent.
 */
 QDBusServer::QDBusServer(const QString &address, QObject *parent)
-    : QObject(parent)
+    : QObject(parent), d(0)
 {
     if (address.isEmpty())
         return;
 
-    if (!qdbus_loadLibDBus()) {
-        d = 0;
+    if (!qdbus_loadLibDBus())
         return;
-    }
 
     emit QDBusConnectionManager::instance()->serverRequested(address, this);
     QObject::connect(d, SIGNAL(newServerConnection(QDBusConnectionPrivate*)),
-- 
cgit v1.2.3