QtDBus: Make sure we can receive unknown types

We must make sure we advance the receiving iterator, or we end up in
an infinite loop.

Task-number: QTBUG-17476

1 files changed, 6 insertions, 1 deletions

diff --git a/src/dbus/qdbusdemarshaller.cpp b/src/dbus/qdbusdemarshaller.cpp
index 91dbf25dd8..ac3b5fabff 100644
--- a/src/dbus/qdbusdemarshaller.cpp
+++ b/src/dbus/qdbusdemarshaller.cpp
@@ -235,7 +235,12 @@ QVariant QDBusDemarshaller::toVariantInternal()
 //        qWarning("QDBusDemarshaller: Found unknown D-Bus type %d '%c'",
 //                 q_dbus_message_iter_get_arg_type(&iterator),
 //                 q_dbus_message_iter_get_arg_type(&iterator));
-        return QVariant();
+        char *ptr = 0;
+        ptr += q_dbus_message_iter_get_arg_type(&iterator);
+        q_dbus_message_iter_next(&iterator);
+
+        // I hope you never dereference this pointer!
+        return QVariant::fromValue<void *>(ptr);
         break;
     };
 }