From 089bdc0fcc1d87c6f5fe0835a4f723a6677e9a01 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 20 Aug 2019 11:15:22 +0200 Subject: Catch invalid simple type that was causing a crash Although the type passes a check that's supposed to find all types with a simple type, and appears to be of a simple type, its primitive type is apparently null. This was causing a segmentation fault. Apparently the code fails to correctly set the primitive type of a pattern-type instance of a union type. Document the known limitation by a QEXPECT_FAIL() in the test; I was unable to find where the primitive type should be set. Task-number: QTBUG-77620 Change-Id: I56b95ed815366c508f71b8af03b6f2a653d338c5 Reviewed-by: Ulf Hermann --- .../qxmlschemavalidator/testdata/QTBUG-77620.xml | 6 ++++ .../qxmlschemavalidator/testdata/QTBUG-77620.xsd | 36 ++++++++++++++++++++++ .../tst_qxmlschemavalidator.cpp | 23 ++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 tests/auto/qxmlschemavalidator/testdata/QTBUG-77620.xml create mode 100644 tests/auto/qxmlschemavalidator/testdata/QTBUG-77620.xsd (limited to 'tests') diff --git a/tests/auto/qxmlschemavalidator/testdata/QTBUG-77620.xml b/tests/auto/qxmlschemavalidator/testdata/QTBUG-77620.xml new file mode 100644 index 0000000..1bde466 --- /dev/null +++ b/tests/auto/qxmlschemavalidator/testdata/QTBUG-77620.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/auto/qxmlschemavalidator/testdata/QTBUG-77620.xsd b/tests/auto/qxmlschemavalidator/testdata/QTBUG-77620.xsd new file mode 100644 index 0000000..33657c7 --- /dev/null +++ b/tests/auto/qxmlschemavalidator/testdata/QTBUG-77620.xsd @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp b/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp index b128bef..51ef07d 100644 --- a/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp +++ b/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp @@ -74,6 +74,8 @@ private Q_SLOTS: void uriResolverSignature() const; void uriResolverDefaultValue() const; void uriResolver() const; + + void unionCrash() const; }; static QXmlSchema createValidSchema() @@ -456,6 +458,27 @@ void tst_QXmlSchemaValidator::uriResolver() const } } +void tst_QXmlSchemaValidator::unionCrash() const +{ + // Regression test for QTBUG-77620 (segfault on nullptr dereference). + const QString path = QFINDTESTDATA("testdata/"); + QXmlSchema schema; + + const QString filePath = path + QLatin1String("QTBUG-77620.xsd"); + + QFile file(filePath); + QVERIFY(file.open(QIODevice::ReadOnly)); + + schema.load(file.readAll(), QUrl(filePath)); + QVERIFY2(schema.isValid(), "Schema should be found valid."); + // Validate instance + QXmlSchemaValidator validator(schema); + QEXPECT_FAIL("", "QTBUG-77620: " // Fixed crash, but not underlying problem: + "the code fails to record the CUSTOM_KEY's primitive type as pattern_type", Continue); + QVERIFY2(validator.validate(QUrl(path + QLatin1String("QTBUG-77620.xml"))), + "Document should be found valid"); +} + QTEST_MAIN(tst_QXmlSchemaValidator) #include "tst_qxmlschemavalidator.moc" -- cgit v1.2.1