diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-04-23 16:29:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 14:39:38 +0200 |
| commit | c1623a0d42c9869e5a1d04081e7660722a863de5 (patch) | |
| tree | 17a58be3a4c80b143add805b7ff8218daab61106 /src/xmlpatterns/schema/qxsdschemaparser.cpp | |
| parent | c18f589a757b2c4cb8c5e66a92f34ac005223cfe (diff) | |
| download | qtxmlpatterns-c1623a0d42c9869e5a1d04081e7660722a863de5.tar.gz | |
Don't use the QRegExp methods that modify the object
QRegExp matching methods modify the object, which we don't want to. In
particular, when we receive a QRegExp from the user or we store in a
context that might require thread-safety, make sure we make a copy
before using it.
QRegularExpression has no such shortcoming.
Task-number: QTBUG-25064
Change-Id: I2c4d5f4b60d6b3569568103cd7107cd2adaa3ae8
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/xmlpatterns/schema/qxsdschemaparser.cpp')
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemaparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp index a00b77e..292886e 100644 --- a/src/xmlpatterns/schema/qxsdschemaparser.cpp +++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp @@ -511,7 +511,7 @@ void XsdSchemaParser::parseSchema(ParserType parserType) if (hasAttribute(CommonNamespaces::XML, QString::fromLatin1("lang"))) { const QString value = readAttribute(QString::fromLatin1("lang"), CommonNamespaces::XML); - const QRegExp exp(QString::fromLatin1("[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*")); + QRegExp exp(QString::fromLatin1("[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*")); if (!exp.exactMatch(value)) { attributeContentError("xml:lang", "schema", value); return; @@ -1286,7 +1286,7 @@ XsdDocumentation::Ptr XsdSchemaParser::parseDocumentation() if (hasAttribute(CommonNamespaces::XML, QString::fromLatin1("lang"))) { const QString value = readAttribute(QString::fromLatin1("lang"), CommonNamespaces::XML); - const QRegExp exp(QString::fromLatin1("[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*")); + QRegExp exp(QString::fromLatin1("[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*")); if (!exp.exactMatch(value)) { attributeContentError("xml:lang", "documentation", value); return documentation; |