whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in QVariant::canConvert. 

The function was crashing when an unsupported type id was given
as an input argument.

Change-Id: I2b0e3e6d43f6f248dc71532f8e6485efe68e8120
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
bb10
Jędrzej Nowacki 2012-03-06 13:34:30 +01:00 committed by Qt by Nokia
parent 779b3188a9
commit f71487da3a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qvariant.cpp
View File

@ -2445,6 +2445,8 @@ bool QVariant::canConvert(int targetTypeId) const
if (currentType == uint(targetTypeId))
return true;
if (targetTypeId < 0 || targetTypeId >= QMetaType::User)
return false;
// FIXME It should be LastCoreType intead of Uuid
if (currentType > int(QMetaType::QUuid) || targetTypeId > int(QMetaType::QUuid)) {

6
tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
View File

@ -612,6 +612,12 @@ void tst_QVariant::canConvert()
QCOMPARE(val.canConvert(QVariant::Time), TimeCast);
QCOMPARE(val.canConvert(QVariant::UInt), UIntCast);
QCOMPARE(val.canConvert(QVariant::ULongLong), ULongLongCast);
// Invalid type ids
QCOMPARE(val.canConvert(-1), false);
QCOMPARE(val.canConvert(-23), false);
QCOMPARE(val.canConvert(-23876), false);
QCOMPARE(val.canConvert(23876), false);
}
void tst_QVariant::toInt_data()