diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-03 19:47:13 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-03 19:59:45 (GMT) |
commit | a4d7572059b5b56d49d7e0c3f3466686e1dc6e16 (patch) | |
tree | 12bc849bb0e2ae56e04486e261ab8c80d5a9400f /tests | |
parent | e98d4aece51fa8691cf33325ab96634fcf9baa81 (diff) | |
download | Qt-a4d7572059b5b56d49d7e0c3f3466686e1dc6e16.zip Qt-a4d7572059b5b56d49d7e0c3f3466686e1dc6e16.tar.gz Qt-a4d7572059b5b56d49d7e0c3f3466686e1dc6e16.tar.bz2 |
QVariant: Fix crash when comparing two variant with the same undefined type.
If the type is the same, but not registered, the returned string could be
null (or empty if a empty string was registered)
In that case, QVariant compare() function would access invalid memory.
Protect against that case. qstrcmp returns 0 if 0 is given as a parametter.
Task-number: QTBUG-8700
Reviewed-by: Markus Goetz
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qvariant/tst_qvariant.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index a316dda..b7e2c81 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -1968,6 +1968,10 @@ void tst_QVariant::operator_eq_eq_data() QTest::newRow("HashSecondLarger") << QVariant(hash1) << QVariant(hash2) << false; } + + QTest::newRow( "UserType" ) << QVariant(QVariant::UserType) << QVariant(QVariant::UserType) << false; + QVariant mUserType(QVariant::UserType); + QTest::newRow( "Shared UserType" ) << mUserType << mUserType << true; } void tst_QVariant::operator_eq_eq() |