diff options
| author | Volker Krause <volker.krause@kdab.com> | 2012-07-27 10:59:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-27 12:23:43 +0200 |
| commit | ef403ba46a0fc28f9209d66de153e4a44ab635ff (patch) | |
| tree | d87aac50cfbe034511c2a28c3029fcbfadce2dfb /src/corelib | |
| parent | ddaee978d1f1b21053eeb060ccc0ad9e49fa93ba (diff) | |
Fix crash in QVariant::canConvert().
When containing a QObject (or sub-class) pointer and trying to convert
to a QObject pointer canConvert() did dereference the pointer without
checking for it being null.
Change-Id: Ie274e54f2f817f2b6c5df64504f8af6359b8f38d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index f8c7046c68..ff5a02b380 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2553,8 +2553,11 @@ static bool canConvertMetaObject(int fromId, int toId, QObject *fromObject) { #ifndef QT_BOOTSTRAPPED QMetaType toType(toId); - if ((QMetaType::typeFlags(fromId) & QMetaType::PointerToQObject) && (toType.flags() & QMetaType::PointerToQObject)) + if ((QMetaType::typeFlags(fromId) & QMetaType::PointerToQObject) && (toType.flags() & QMetaType::PointerToQObject)) { + if (!fromObject) + return true; return canConvertMetaObject(fromObject->metaObject(), toType.metaObject()); + } #else Q_UNUSED(fromId); Q_UNUSED(toId); |