CoreFoundation: Create an XML Node of notation declaration when DTD node is parsed.

Author: YOCKOW

CoreFoundation/Parsing.subproj/CFXMLInterface.c

@@ -1009,6 +1009,14 @@ _CFXMLDTDPtr _CFXMLNewDTD(_CFXMLDocPtr doc, const unsigned char* name, const uns
     return xmlNewDtd(doc, name, publicID, systemID);
 }
 
+void _CFXMLNotationScanner(void* payload, void* data, xmlChar* name) {
+    xmlNotationPtr notation = (xmlNotationPtr)payload;
+    _cfxmlNotation* node = (_cfxmlNotation*)data;
+    node->type = XML_NOTATION_NODE;
+    node->name = notation->name;
+    node->notation = notation;
+}
+
 _CFXMLDTDNodePtr _CFXMLParseDTDNode(const unsigned char* xmlString) {
     CFDataRef data = CFDataCreateWithBytesNoCopy(NULL, xmlString, xmlStrlen(xmlString), kCFAllocatorNull);
     xmlDtdPtr dtd = _CFXMLParseDTDFromData(data, NULL);
@@ -1019,7 +1027,12 @@ _CFXMLDTDNodePtr _CFXMLParseDTDNode(const unsigned char* xmlString) {
     }
 
     xmlNodePtr node = dtd->children;
-    xmlUnlinkNode(node);
+    if (node != NULL) {
+        xmlUnlinkNode(node);
+    } else if (dtd->notations) {
+        node = (xmlNodePtr)calloc(1, sizeof(_cfxmlNotation));
+        xmlHashScan((xmlNotationTablePtr)dtd->notations, &_CFXMLNotationScanner, (void*)node);
+    }
 
     return node;
 }