diff options
-rw-r--r-- | tests/auto/qml/qmllint/data/SegFault.bad.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml/qmllint/data/SegFault.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml/qmllint/tst_qmllint.cpp | 10 | ||||
-rw-r--r-- | tools/qmllint/checkidentifiers.cpp | 2 |
4 files changed, 23 insertions, 1 deletions
diff --git a/tests/auto/qml/qmllint/data/SegFault.bad.qml b/tests/auto/qml/qmllint/data/SegFault.bad.qml new file mode 100644 index 0000000000..c31777e7c8 --- /dev/null +++ b/tests/auto/qml/qmllint/data/SegFault.bad.qml @@ -0,0 +1,6 @@ +import QtQuick as T +T.Item { + T.Rectangle { + property int length: parent.T.Screen.foobar + } +} diff --git a/tests/auto/qml/qmllint/data/SegFault.qml b/tests/auto/qml/qmllint/data/SegFault.qml new file mode 100644 index 0000000000..c66ad472f1 --- /dev/null +++ b/tests/auto/qml/qmllint/data/SegFault.qml @@ -0,0 +1,6 @@ +import QtQuick as T +T.Item { + T.Rectangle { + property int length: parent.T.Screen.pixelDensity + } +} diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp index 12b8f5619f..54e0adee51 100644 --- a/tests/auto/qml/qmllint/tst_qmllint.cpp +++ b/tests/auto/qml/qmllint/tst_qmllint.cpp @@ -277,6 +277,12 @@ void TestQmllint::dirtyQmlCode_data() << QStringLiteral("brokenNamespace.qml") << QString("Warning: type not found in namespace at %1:4:17") << QString(); + // TODO: This fails but currently for the wrong reasons, make sure to add a warning message requirement + // once it does fail properly in order to avoid regressions. + QTest::newRow("segFault (bad)") + << QStringLiteral("SegFault.bad.qml") + << QString() + << QString(); QTest::newRow("VariableUsedBeforeDeclaration") << QStringLiteral("useBeforeDeclaration.qml") << QStringLiteral("Variable \"argq\" is used before its declaration at 5:9. " @@ -357,12 +363,14 @@ void TestQmllint::cleanQmlCode_data() QTest::newRow("jsmoduleimport") << QStringLiteral("jsmoduleimport.qml"); QTest::newRow("overridescript") << QStringLiteral("overridescript.qml"); QTest::newRow("multiExtension") << QStringLiteral("multiExtension.qml"); + QTest::newRow("segFault") << QStringLiteral("SegFault.qml"); } void TestQmllint::cleanQmlCode() { QFETCH(QString, filename); const QString warnings = runQmllint(filename, true); + QEXPECT_FAIL("segFault", "This property exists and should not produce a warning", Abort); QVERIFY2(warnings.isEmpty(), qPrintable(warnings)); } @@ -407,6 +415,8 @@ QString TestQmllint::runQmllint(const QString &fileToLint, bool shouldSucceed, c return runQmllint(fileToLint, [&](QProcess &process) { QVERIFY(process.waitForFinished()); QCOMPARE(process.exitStatus(), QProcess::NormalExit); + + QEXPECT_FAIL("segFault", "This property exists and should not produce a warning", Abort); if (shouldSucceed) QCOMPARE(process.exitCode(), 0); else diff --git a/tools/qmllint/checkidentifiers.cpp b/tools/qmllint/checkidentifiers.cpp index e78ebdae90..b41b68b719 100644 --- a/tools/qmllint/checkidentifiers.cpp +++ b/tools/qmllint/checkidentifiers.cpp @@ -252,7 +252,7 @@ bool CheckIdentifiers::checkMemberAccess(const QVector<FieldMember> &members, if (access.m_name.front().isUpper() && scope->scopeType() == QQmlJSScope::QMLScope) { // may be an attached type const auto it = m_types.find(access.m_name); - if (it != m_types.end() && !(*it)->attachedTypeName().isEmpty()) { + if (it != m_types.end() && *it && !(*it)->attachedTypeName().isEmpty()) { if (const auto attached = (*it)->attachedType()) { scope = attached; continue; |