Merge branch 'xmlExtRefBuffer'

4 files changed, 23 insertions, 1 deletions

diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 2f5384b..0c7f2ab 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -7748,7 +7748,13 @@ bool QXmlSimpleReaderPrivate::processReference()
                                     return false;
                                 }
                                 if (ret) {
-                                    QString xmlRefString = ret->data();
+                                    QString xmlRefString;
+                                    QString buffer = ret->data();
+                                    while (buffer.length()>0){
+                                        xmlRefString += buffer;
+                                        ret->fetchData();
+                                        buffer = ret->data();
+                                    }
                                     delete ret;
                                     if (!stripTextDecl(xmlRefString)) {
                                         reportParseError(QLatin1String(XMLERR_ERRORINTEXTDECL));
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent
new file mode 100755
index 0000000..86a8679
--- /dev/null
+++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml
new file mode 100644
index 0000000..5550dab
--- /dev/null
+++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [

+<!ELEMENT doc k(#PCDATA)>

+<!ENTITY e SYSTEM "015.ent">

+]>

+<doc>&e;</doc>

+

diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml.ref b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml.ref
new file mode 100644
index 0000000..1ec309a
--- /dev/null
+++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="e", publicId="", systemId="015.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      resolveEntity(publicId="", systemId="015.ent", ret={})
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()