[[ Bug 11903 ]] Use WithOptions variants of libxml SAX functions so that XML data limits can be turned off (XML_PARSE_HUGE).

runrevmark · runrevmark · commit 9944ce3e897a · 2014-03-10T14:22:38.000Z
diff --git a/docs/notes/bugfix-11903.md b/docs/notes/bugfix-11903.md
@@ -0,0 +1 @@
+# Ensure large XML files (those with large text nodes) still parse.
diff --git a/revxml/src/xmldoc.cpp b/revxml/src/xmldoc.cpp
@@ -234,7 +234,15 @@ Bool CXMLDocument::Read(char *data, unsigned long tlength, Bool wellformed)
 {
 	xmlKeepBlanksDefault(0);
 	Free(); //free document	
-	doc =  xmlSAXParseMemory(&SAXHandlerTable, data, tlength, !wellformed);
+	
+	// MW-2014-03-10: [[ Bug 11903 ]] Use modified libXML functions that allow us to
+	//   pass through XML_PARSE_HUGE (so the new 2.9 limits don't apply!).
+	int options;
+	options = XML_PARSE_HUGE;
+	if (!wellformed)
+		options |= XML_PARSE_RECOVER;
+	
+	doc =  xmlSAXParseMemoryWithDataAndOptions(&SAXHandlerTable, data, tlength, options, NULL);
 
 	// OK-2007-12-17 : Bug 5632. If Validate() is called in this context it crashes
 	// For now we just remove the validation step from here as it proved difficult to
@@ -250,7 +258,15 @@ Bool CXMLDocument::ReadFile(char *filename,  Bool wellformed)
 {
 	xmlKeepBlanksDefault(0);
 	Free(); //free document	
-	doc =  xmlSAXParseFile(&SAXHandlerTable, filename, !wellformed);
+	
+	// MW-2014-03-10: [[ Bug 11903 ]] Use modified libXML functions that allow us to
+	//   pass through XML_PARSE_HUGE (so the new 2.9 limits don't apply!).
+	int options;
+	options = XML_PARSE_HUGE;
+	if (!wellformed)
+		options |= XML_PARSE_RECOVER;
+		
+	doc =  xmlSAXParseFileWithDataAndOptions(&SAXHandlerTable, filename, options, NULL);
 
 	// OK-2007-12-17 : Bug 5632. If Validate() is called in this context it crashes
 	// For now we just remove the validation step from here as it proved difficult to
diff --git a/thirdparty b/thirdparty
@@ -1 +1 @@
-Subproject commit 1394a0f45abd96bd7e85481e8610313cf8757b23
+Subproject commit ebbbdda0194d4c22c5560c1c684e0f0c62aa4977

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure large XML files (those with large text nodes) still parse.`