diff options
author | Sami Rosendahl <ext-sami.1.rosendahl@nokia.com> | 2011-11-22 13:52:15 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-25 21:58:57 +0100 |
commit | b9acd85b2f92f887521b952f84ced9a2d1a8a57e (patch) | |
tree | d2189fb79845fd11c8d7c7ffb97a8af44eb6f9ca /tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | |
parent | b4398dc4e372dbe829b21423e1a0a93a6a542994 (diff) |
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: Ie20f2adc06c697a68055c803215fb408568fdd90
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp')
-rw-r--r-- | tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index 8ce456bf0e..1886c8fe5a 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -102,6 +102,9 @@ private slots: void demarshallInvalidStringList_data(); void demarshallInvalidStringList(); + void demarshallInvalidByteArray_data(); + void demarshallInvalidByteArray(); + private: int fileDescriptorForTest(); @@ -1427,5 +1430,55 @@ void tst_QDBusMarshall::demarshallInvalidStringList() QVERIFY(receiveArg.atEnd()); } +void tst_QDBusMarshall::demarshallInvalidByteArray_data() +{ + addBasicTypesColumns(); + + // None of the basic types should demarshall to a QByteArray + basicNumericTypes_data(); + basicStringTypes_data(); + + // Arrays of other types than byte should not demarshall to a QByteArray + QList<bool> bools; + QTest::newRow("empty array of bool") << qVariantFromValue(bools); + bools << true << false << true; + QTest::newRow("non-empty array of bool") << qVariantFromValue(bools); + + // Structures should not demarshall to a QByteArray + QTest::newRow("struct of bytes") + << qVariantFromValue(QVariantList() << uchar(1) << uchar(2)); + + QTest::newRow("struct of mixed types") + << qVariantFromValue(QVariantList() << int(42) << QString("foo") << double(3.14)); +} + +void tst_QDBusMarshall::demarshallInvalidByteArray() +{ + QFETCH(QVariant, value); + + QDBusConnection con = QDBusConnection::sessionBus(); + + QVERIFY(con.isConnected()); + + QDBusMessage msg = QDBusMessage::createMethodCall(serviceName, objectPath, + interfaceName, "ping"); + QDBusArgument sendArg; + sendArg.beginStructure(); + sendArg.appendVariant(value); + sendArg.endStructure(); + msg.setArguments(QVariantList() << qVariantFromValue(sendArg)); + QDBusMessage reply = con.call(msg); + + const QDBusArgument receiveArg = qvariant_cast<QDBusArgument>(reply.arguments().at(0)); + receiveArg.beginStructure(); + + QByteArray receiveValue; + receiveArg >> receiveValue; + QCOMPARE(receiveValue, QByteArray()); + + receiveArg.endStructure(); + QVERIFY(receiveArg.atEnd()); +} + QTEST_MAIN(tst_QDBusMarshall) #include "tst_qdbusmarshall.moc" |