summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusargument_p.h
diff options
context:
space:
mode:
authorSami Rosendahl <ext-sami.1.rosendahl@nokia.com>2011-12-05 13:06:40 +0200
committerQt by Nokia <qt-info@nokia.com>2011-12-25 21:58:57 +0100
commitb4398dc4e372dbe829b21423e1a0a93a6a542994 (patch)
tree9473bae08a2b2edcdccd5be3a6654f6424319235 /src/dbus/qdbusargument_p.h
parent8f19f142745f3cb0690dcd51cebc66153e396805 (diff)
Fix crash in QDBusDemarshaller QStringList extraction
QDBusArgument QStringList extraction operator and QDBusDemarshaller that implements the extraction do not check the type of the extracted value. When extracting a QStringList and the value actually is e.g. an array of bytes the string list extraction will crash as it interprets the bytes as char pointers. The fix adds DBus type checks to QDBusArgument QStringList extraction operator implementations. The checks are as permissive as possible provided crashes are avoided. Task-number: QTBUG-22840 Change-Id: I4b67d75b59c5052d939f3a69f3e92dabdb3bdd6b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusargument_p.h')
-rw-r--r--src/dbus/qdbusargument_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h
index 3ecb798f31..df2b2a011b 100644
--- a/src/dbus/qdbusargument_p.h
+++ b/src/dbus/qdbusargument_p.h
@@ -212,6 +212,7 @@ private:
QString toStringUnchecked();
QDBusObjectPath toObjectPathUnchecked();
QDBusSignature toSignatureUnchecked();
+ QStringList toStringListUnchecked();
};
inline QDBusMarshaller *QDBusArgumentPrivate::marshaller()