summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2019-08-20 11:15:22 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-12-04 11:17:46 +0100
commit089bdc0fcc1d87c6f5fe0835a4f723a6677e9a01 (patch)
treed4e3c15a9f44e4b7dcbd8efa1a1cc3f3aa3aae09 /src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
parent9e7745d7e283570ca8504909d20c39d3aca18cf7 (diff)
downloadqtxmlpatterns-089bdc0fcc1d87c6f5fe0835a4f723a6677e9a01.tar.gz
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 <ulf.hermann@qt.io>
Diffstat (limited to 'src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp')
-rw-r--r--src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
index 7e60667..de772e5 100644
--- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
+++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
@@ -1113,6 +1113,7 @@ bool XsdValidatingInstanceReader::selectNodeSets(const XsdElement::Ptr&, const Q
const QXmlNodeModelIndex index = fieldItem.toNodeModelIndex();
const SchemaType::Ptr type = m_model->assignedType(index);
+ Q_ASSERT(type);
bool typeOk = true;
if (type->isComplexType()) {
@@ -1136,6 +1137,15 @@ bool XsdValidatingInstanceReader::selectNodeSets(const XsdElement::Ptr&, const Q
targetType = XsdSimpleType::Ptr(type)->primitiveType();
else
targetType = XsdComplexType::Ptr(type)->contentType()->simpleType();
+
+ if (!targetType) {
+ // QTBUG-77620: pattern type within a union doesn't get
+ // its primitive type set. FIXME: find root cause and
+ // fix that, so we can remove this (and an XFAIL).
+ error(QtXmlPatterns::tr("Field %1 is missing its simple type.")
+ .arg(formatData(field->expression())));
+ return false;
+ }
} else {
if (BuiltinTypes::xsAnySimpleType->name(m_namePool) == type->name(m_namePool)) {
targetType = BuiltinTypes::xsString;