From b6a43cfe9c136e298feaa8d48fc252fdb3d4e7c5 Mon Sep 17 00:00:00 2001 From: Sami Rosendahl Date: Mon, 9 Jan 2012 15:29:53 +0200 Subject: Fix memory leak in QDomDocument entity text expansion 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. Re-enabled commented-out test data tst_QDom::setContent to exercise the code path with the leak. Change-Id: Ieb015d68ba9bbb3f20dd47e76835ad15abb1738e Reviewed-by: Olivier Goffart --- src/xml/dom/qdom.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/xml/dom') diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 25638717a0..3b1e2a8bb7 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -7457,6 +7457,7 @@ bool QDomHandler::characters(const QString& ch) QScopedPointer e(new QDomEntityPrivate(doc, 0, entityName, QString(), QString(), QString())); e->value = ch; + e->ref.deref(); doc->doctype()->appendChild(e.data()); e.take(); n.reset(doc->createEntityReference(entityName)); -- cgit v1.2.3