diff options
author | Sami Rosendahl <ext-sami.1.rosendahl@nokia.com> | 2012-01-05 13:52:39 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-06 02:59:55 +0100 |
commit | 1bc31fa43ddefe468c9f079156bfad0371e2a61b (patch) | |
tree | f67c0c6614bf81cedbbda9d23a95055eb75cf136 /tests/auto/xml | |
parent | 17cc46a9a73a419619f2c13f26ef228325aa4a85 (diff) |
Fix memory leak in QDomDocument DTD notation declaration handler
The created notation node's reference count needs to be decremented to 0
before it is added as a child, because appendChild will increment the
reference count to correct value of 1. Also added autotest DTDNotationDecl
to tst_qdom to expose the leak when executed under valgrind memcheck.
There was no previous test coverage for the notation declarations in DTD.
Task-number: QTBUG-22588
Change-Id: I876186d1277ceb4414f803b58b62f51cc1474367
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/xml')
-rw-r--r-- | tests/auto/xml/dom/qdom/tst_qdom.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp index 44af4a03d8..38d2d76272 100644 --- a/tests/auto/xml/dom/qdom/tst_qdom.cpp +++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp @@ -125,6 +125,7 @@ private slots: void taskQTBUG4595_dontAssertWhenDocumentSpecifiesUnknownEncoding() const; void cloneDTD_QTBUG8398() const; + void DTDNotationDecl(); void cleanupTestCase() const; @@ -1923,5 +1924,28 @@ void tst_QDom::cloneDTD_QTBUG8398() const domDocument2.save(stream, 0); QCOMPARE(output, expected); } + +void tst_QDom::DTDNotationDecl() +{ + QString dtd("<?xml version='1.0' encoding='UTF-8'?>\n" + "<!DOCTYPE first [\n" + "<!NOTATION gif SYSTEM 'image/gif'>\n" + "<!NOTATION jpeg SYSTEM 'image/jpeg'>\n" + "]>\n" + "<first/>\n"); + + QDomDocument domDocument; + QVERIFY(domDocument.setContent(dtd)); + + const QDomDocumentType doctype = domDocument.doctype(); + QCOMPARE(doctype.notations().size(), 2); + + QVERIFY(doctype.namedItem(QString("gif")).isNotation()); + QCOMPARE(doctype.namedItem(QString("gif")).toNotation().systemId(), QString("image/gif")); + + QVERIFY(doctype.namedItem(QString("jpeg")).isNotation()); + QCOMPARE(doctype.namedItem(QString("jpeg")).toNotation().systemId(), QString("image/jpeg")); +} + QTEST_MAIN(tst_QDom) #include "tst_qdom.moc" |