summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-09-27 12:00:01 -0700
committerThiago Macieira <thiago.macieira@intel.com>2015-10-15 16:20:35 +0000
commitc401506ffc33053c4fe8b0e5ff492361653be12a (patch)
tree174c868e71ce9c72f762cda0e75e55ba60ab6df0
parent7dc0f42e7813953aa9b423e40d4be8039e6cacaa (diff)
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>
-rw-r--r--src/dbus/qdbusserver.cpp6
1 files changed, 2 insertions, 4 deletions
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*)),