qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QDom: preserve empty CDATA sections 

Restores Qt 5 behavior.

Fixes: QTBUG-101992
Pick-to: 6.3 6.2
Change-Id: I3b9fc077c0a0fd30f4fcce7bfa342dbe96b2c582
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2022-03-23 18:47:13 +01:00
parent 64db79f856
commit edb64351cd
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xml/dom/qdomhelpers.cpp
View File

@ -364,7 +364,7 @@ bool QDomParser::parseBody()
break; break;
case QXmlStreamReader::Characters: case QXmlStreamReader::Characters:
if (!reader->isWhitespace()) { // Skip the content consisting of only whitespaces if (!reader->isWhitespace()) { // Skip the content consisting of only whitespaces
if (!reader->text().trimmed().isEmpty()) { if (reader->isCDATA() || !reader->text().trimmed().isEmpty()) {
if (!domBuilder.characters(reader->text().toString(), reader->isCDATA())) { if (!domBuilder.characters(reader->text().toString(), reader->isCDATA())) {
domBuilder.fatalError(QDomParser::tr( domBuilder.fatalError(QDomParser::tr(
"Error occurred while processing the element content")); "Error occurred while processing the element content"));

12
tests/auto/xml/dom/qdom/tst_qdom.cpp
View File

@ -87,6 +87,7 @@ private slots:
void invalidCharData(); void invalidCharData();
void roundTripAttributes() const; void roundTripAttributes() const;
void roundTripCDATA() const;
void normalizeEndOfLine() const; void normalizeEndOfLine() const;
void normalizeAttributes() const; void normalizeAttributes() const;
void serializeWeirdEOL() const; void serializeWeirdEOL() const;
@ -1441,6 +1442,17 @@ void tst_QDom::roundTripAttributes() const
QCOMPARE(QString::fromLatin1(serialized.constData()), QString::fromLatin1(expected.constData())); QCOMPARE(QString::fromLatin1(serialized.constData()), QString::fromLatin1(expected.constData()));
} }
void tst_QDom::roundTripCDATA() const
{
const QString input = u"<?xml version='1.0' encoding='UTF-8'?>\n"
"<content><![CDATA[]]></content>\n"_qs;
QString errorMsg;
QDomDocument doc;
QVERIFY(doc.setContent(input, false, &errorMsg));
QVERIFY(errorMsg.isEmpty());
QCOMPARE(doc.toString(), input);
}
void tst_QDom::normalizeEndOfLine() const void tst_QDom::normalizeEndOfLine() const
{ {
QByteArray input("<a>\r\nc\rc\ra\na</a>"); QByteArray input("<a>\r\nc\rc\ra\na</a>");