From cecceb0cdd87482124a73ecf537f3445d68be13e Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 12 Nov 2013 13:44:56 +0100 Subject: Fully expand entities to ensure deep or widely nested ones fail parsing With 512a1ce0698d370c313bb561bbf078935fa0342e, we failed when parsing entities whose partially expanded size was greater than 1024 characters. That was not enough, so now we fully expand all entities. This is a backport of f1053d94f59f053ce4acad9320df14f1fbe4faac. Change-Id: I41dd6f4525c63e82fd320a22d19248169627f7e0 Reviewed-by: Richard J. Moore --- tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto') diff --git a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp index 2c04d8e8c4..98284ad0ee 100644 --- a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp +++ b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp @@ -825,7 +825,7 @@ void tst_QXmlSimpleReader::dtdRecursionLimit() xmlReader.setDeclHandler(&handler); xmlReader.setErrorHandler(&handler); QVERIFY(!xmlReader.parse(source)); - QVERIFY(handler.recursionCount == 1); + QCOMPARE(handler.recursionCount, 2); } } -- cgit v1.2.3