AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak in QDomDocument DTD entity declaration handler

Browse Source 
The created entity 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 DTDEntityDecl
to tst_qdom to expose the leak when executed under valgrind memcheck.
There was no previous direct test case for unparsed entity declarations in
DTD, only indirect coverage via regression test cloneDTD_QTBUG8398.

Task-number: QTBUG-22587
Change-Id: I394ae9fc32d5b84e4ca287c5db4dd7effde6128b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Sami Rosendahl 2012-01-05 13:56:53 +02:00 committed by Qt by Nokia
parent 1bc31fa43d
commit d55cdcd59f
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7541,6 +7541,8 @@ bool QDomHandler::unparsedEntityDecl(const QString &name, const QString &publicI
{
QDomEntityPrivate* e = new QDomEntityPrivate(doc, 0, name,
publicId, systemId, notationName);
// keep the refcount balanced: appendChild() does a ref anyway.
e->ref.deref();
doc->doctype()->appendChild(e);
return true;
}

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

@ -126,6 +126,7 @@ private slots:
void taskQTBUG4595_dontAssertWhenDocumentSpecifiesUnknownEncoding() const;
void cloneDTD_QTBUG8398() const;
void DTDNotationDecl();
void DTDEntityDecl();
void cleanupTestCase() const;
@ -1947,5 +1948,29 @@ void tst_QDom::DTDNotationDecl()
QCOMPARE(doctype.namedItem(QString("jpeg")).toNotation().systemId(), QString("image/jpeg"));
}
void tst_QDom::DTDEntityDecl()
{
QString dtd("<?xml version='1.0' encoding='UTF-8'?>\n"
"<!DOCTYPE first [\n"
"<!ENTITY secondFile SYSTEM 'second.xml'>\n"
"<!ENTITY logo SYSTEM \"http://www.w3c.org/logo.gif\" NDATA gif>"
"]>\n"
"<first/>\n");
QDomDocument domDocument;
QVERIFY(domDocument.setContent(dtd));
const QDomDocumentType doctype = domDocument.doctype();
QCOMPARE(doctype.entities().count(), 2);
QVERIFY(doctype.namedItem(QString("secondFile")).isEntity());
QCOMPARE(doctype.namedItem(QString("secondFile")).toEntity().systemId(), QString("second.xml"));
QCOMPARE(doctype.namedItem(QString("secondFile")).toEntity().notationName(), QString());
QVERIFY(doctype.namedItem(QString("logo")).isEntity());
QCOMPARE(doctype.namedItem(QString("logo")).toEntity().systemId(), QString("http://www.w3c.org/logo.gif"));
QCOMPARE(doctype.namedItem(QString("logo")).toEntity().notationName(), QString("gif"));
}
QTEST_MAIN(tst_QDom)
#include "tst_qdom.moc"