summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorJakub Wieczorek <faw217@gmail.com>2009-10-26 21:23:28 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2009-11-25 09:41:04 (GMT)
commitc6eee578665bfd2c3b25b238cf8ae24fee00f9f7 (patch)
tree65068fe7c4938510a8a807e19202381e64f46354 /src/corelib
parent6cb0ac70301a21e914cb5716642c756312b3ec30 (diff)
downloadQt-c6eee578665bfd2c3b25b238cf8ae24fee00f9f7.zip
Qt-c6eee578665bfd2c3b25b238cf8ae24fee00f9f7.tar.gz
Qt-c6eee578665bfd2c3b25b238cf8ae24fee00f9f7.tar.bz2
QXmlStream: Fix parsing of DTDs that contain empty markup declarations
like e.g. <!DOCTYPE doc []> According to the specification, it is possible for a doctype to contain no markup declarations: http://www.w3.org/TR/xml/#sec-prolog-dtd "intSubset ::= (markupdecl | DeclSep)*" However, currently QXmlStreamReader would raise an error when encountering such a declaration. Merge-request: 1926 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/xml/qxmlstream.g1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g
index 22ba33d..9921d41 100644
--- a/src/corelib/xml/qxmlstream.g
+++ b/src/corelib/xml/qxmlstream.g
@@ -915,6 +915,7 @@ markup ::= markup_start markup_list RBRACK;
markup_list ::= markup_decl | space | pereference;
markup_list ::= markup_list markup_decl | markup_list space | markup_list pereference;
+markup_list ::=;
markup_decl ::= element_decl | attlist_decl | entity_decl | entity_done | notation_decl | processing_instruction | comment;