diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-10 03:02:04 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-10 03:02:04 +0100 |
| commit | fd98985f82cd6a6bb71f4653455d2709c3da5b82 (patch) | |
| tree | ac9845eaf48231ed615e571da4cf81c15db7f2ed /tests | |
| parent | 5caf6d31f90a502ad0ca7cd1e222d84e67b77259 (diff) | |
| parent | b714eeba4163c03532ac9cd017095dba8932a81c (diff) | |
| download | qtxmlpatterns-fd98985f82cd6a6bb71f4653455d2709c3da5b82.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I3eb54f906dc1ee8fedf64a4cde67edb3f8ce5460
Diffstat (limited to 'tests')
3 files changed, 65 insertions, 0 deletions
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 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<root> + <item key="KEY1" /> + <item key="KEY2" /> + <item key="CUSTOM_KEY1" /> +</root> 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 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:simpleType name="pattern_type"> + <xs:restriction base="xs:string"> + <xs:pattern value="CUSTOM_[0-9a-zA-Z]+" /> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="enum_type"> + <xs:restriction base="xs:string"> + <xs:enumeration value="KEY1" /> + <xs:enumeration value="KEY2" /> + <!-- Note: *no* matching entry for key "CUSTOM_KEY1" --> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="union_type"> + <xs:union memberTypes="enum_type pattern_type" /> + </xs:simpleType> + + <xs:element name="root"> + <xs:complexType> + <xs:sequence> + <xs:element name="item" maxOccurs="unbounded"> + <xs:complexType> + <xs:attribute name="key" type="union_type" use="required" /> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + <xs:key name="primary_key"> + <xs:selector xpath="./item" /> + <xs:field xpath="@key" /> + </xs:key> + </xs:element> +</xs:schema> 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" |