summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusargument_p.h
diff options
context:
space:
mode:
authorSami Rosendahl <ext-sami.1.rosendahl@nokia.com>2012-01-17 11:43:59 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-01-25 12:29:00 (GMT)
commit4e8e0b3e215c1b958457a9154b56f3b14a1c8518 (patch)
treee238c2251529e184c522ad8faeec7c95b0d144b3 /src/dbus/qdbusargument_p.h
parentd1cd17713e6d0bd9c7a270ba675704ad244e2b13 (diff)
downloadQt-4e8e0b3e215c1b958457a9154b56f3b14a1c8518.zip
Qt-4e8e0b3e215c1b958457a9154b56f3b14a1c8518.tar.gz
Qt-4e8e0b3e215c1b958457a9154b56f3b14a1c8518.tar.bz2
Fix crashes and non-portable functionality in QDBusDemarshaller QByteArray extraction
QDBusArgument QByteArray extraction operator and QDBusDemarshaller that implements the extraction do not check the type of the extracted value. When extracting a QByteArray when the value actually is e.g. a struct of mixed types the byte array extraction will crash as it attempts to extract the struct data as a fixed array. The fix adds DBus type checks to QDBusArgument byte array extraction operator implementations. The checks invalidate extracting arrays of other types than bytes to a QByteArray that worked with the unchecked implementation. The rationale for this restriction is 1) extracting a QByteArray to a variant checks already that the array element type is byte 2) Results of extracting arrays of types wider than a byte to a QByteArray are architecture-dependent making such code inherently non-portable. Task-number: QTBUG-22840 Change-Id: Iaa284603c65d7a431a3fd020c18240cd8199ceb9 (From Qt5 commit b9acd85b2f92f887521b952f84ced9a2d1a8a57e) 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 e977c99..c04e458 100644
--- a/src/dbus/qdbusargument_p.h
+++ b/src/dbus/qdbusargument_p.h
@@ -213,6 +213,7 @@ private:
QDBusObjectPath toObjectPathUnchecked();
QDBusSignature toSignatureUnchecked();
QStringList toStringListUnchecked();
+ QByteArray toByteArrayUnchecked();
};
inline QDBusMarshaller *QDBusArgumentPrivate::marshaller()