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

QVariant: guard usage of fromType.metaObject() 

This patch amends 19874d6a63. That patch caused a
crash to occur when running the auto test
tst_QQuickApplicationWindow::attachedProperties().
The crash can be traced back to QMetaType trying
to access fromType.metaObject(), which is null.

This patch will add a guard to ensure that we
don't try to call a function on an object that is null.

Fixes: QTBUG-86517
Change-Id: Idafd154a7b6a43e16126038fc5f9b30d7871f0d0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Richard Moe Gustavsen 2020-09-09 10:37:19 +02:00
parent 3a1dad83ed
commit f9f1043e8a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2049,7 +2049,7 @@ bool QMetaType::convert(QMetaType fromType, const void *from, QMetaType toType,
if (fromObject && fromObject->metaObject()->inherits(toType.metaObject())) {
*static_cast<QObject **>(to) = toType.metaObject()->cast(fromObject);
return true;
} else if (!fromObject) {
} else if (!fromObject && fromType.metaObject()) {
// if fromObject is null, use static fromType to check if conversion works
*static_cast<void **>(to) = nullptr;
return fromType.metaObject()->inherits(toType.metaObject());