From 970f19bdb55cd559e9ef97228d30fd52b20e39cb Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 8 Dec 2009 20:28:45 +0100
Subject: Fix crash in QDBusPendingReply/QDBusReply in case of unconnected
 calls.

If we made calls on a QDBusConnection that isn't connected, the d
pointer is 0. Ensure we don't crash.

Task-number: QTBUG-6571
Reviewed-by: Bradley T. Hughes
---
 src/dbus/qdbuspendingreply.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/dbus/qdbuspendingreply.h')

diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h
index b7f54e430c..4f90c986de 100644
--- a/src/dbus/qdbuspendingreply.h
+++ b/src/dbus/qdbuspendingreply.h
@@ -188,6 +188,7 @@ public:
 private:
     inline void calculateMetaTypes()
     {
+        if (!d) return;
         int typeIds[Count > 0 ? Count : 1]; // use at least one since zero-sized arrays aren't valid
         ForEach::fillMetaTypes(typeIds);
         setMetaTypes(Count, typeIds);
-- 
cgit v1.2.1