summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbuspendingreply.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-12-08 19:28:45 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-12-09 09:15:29 (GMT)
commit970f19bdb55cd559e9ef97228d30fd52b20e39cb (patch)
tree1a807904533630fede6cdc423a85a686af89f5a1 /src/dbus/qdbuspendingreply.h
parent0b78ccc201f58b53c90e6327b051bfdb8c08ee14 (diff)
downloadQt-970f19bdb55cd559e9ef97228d30fd52b20e39cb.zip
Qt-970f19bdb55cd559e9ef97228d30fd52b20e39cb.tar.gz
Qt-970f19bdb55cd559e9ef97228d30fd52b20e39cb.tar.bz2
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
Diffstat (limited to 'src/dbus/qdbuspendingreply.h')
-rw-r--r--src/dbus/qdbuspendingreply.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h
index b7f54e4..4f90c98 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);