Skip to content

Commit

Permalink
Merge pull request #2343 from YOCKOW/sr10921
Browse files Browse the repository at this point in the history 
SR-10921: Fix bugs related to XML Namespace.
  • Loading branch information
@millenomi
millenomi committed Jul 23, 2019
2 parents d1bd34c + 691247e commit fe53405
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 33 deletions.
62 changes: 41 additions & 21 deletions CoreFoundation/Parsing.subproj/CFXMLInterface.c
View file
Expand Up @@ -399,6 +399,8 @@ CFStringRef _CFXMLNodeCopyURI(_CFXMLNodePtr node) {
case XML_ELEMENT_NODE:
if (nodePtr->ns && nodePtr->ns->href) {
return CFStringCreateWithCString(NULL, (const char*)nodePtr->ns->href, kCFStringEncodingUTF8);
} else if (nodePtr->nsDef && nodePtr->nsDef->href) {
return CFStringCreateWithCString(NULL, (const char*)nodePtr->nsDef->href, kCFStringEncodingUTF8);
} else {
return NULL;
}
Expand All @@ -421,17 +423,17 @@ void _CFXMLNodeSetURI(_CFXMLNodePtr node, const unsigned char* URI) {
case XML_ELEMENT_NODE:

if (!URI) {
if (nodePtr->ns) {
xmlFree(nodePtr->ns);
if (nodePtr->nsDef) {
xmlFree(nodePtr->nsDef);
}
nodePtr->ns = NULL;
nodePtr->nsDef = NULL;
return;
}

xmlNsPtr ns = xmlSearchNsByHref(nodePtr->doc, nodePtr, URI);
if (!ns) {
if (nodePtr->ns && (nodePtr->ns->href == NULL)) {
nodePtr->ns->href = xmlStrdup(URI);
if (nodePtr->nsDef && (nodePtr->nsDef->href == NULL)) {
nodePtr->nsDef->href = xmlStrdup(URI);
return;
}

Expand Down Expand Up @@ -939,11 +941,27 @@ CFStringRef _Nullable _CFXMLCopyPathForNode(_CFXMLNodePtr node) {
return result;
}

static inline const xmlChar* _getNamespacePrefix(const char* name) {
// It is "default namespace" if `name` is empty.
// Default namespace is represented by `NULL` in libxml2.
return (name == NULL || name[0] == '\0') ? NULL : (const xmlChar*)name;
}

static inline int _compareNamespacePrefix(const xmlChar* prefix1, const xmlChar* prefix2) {
if (prefix1 == NULL) {
if (prefix2 == NULL) return 0;
return -1;
} else {
if (prefix2 == NULL) return 1;
return xmlStrcmp(prefix1, prefix2);
}
}

static inline xmlNsPtr _searchNamespace(xmlNodePtr nodePtr, const xmlChar* prefix) {
while (nodePtr != NULL) {
xmlNsPtr ns = nodePtr->ns;
xmlNsPtr ns = nodePtr->nsDef;
while (ns != NULL) {
if (xmlStrcmp(prefix, ns->prefix) == 0) {
if (_compareNamespacePrefix(prefix, ns->prefix) == 0) {
return ns;
}
ns = ns->next;
Expand Down Expand Up @@ -1333,14 +1351,14 @@ void _CFXMLDTDNodeSetPublicID(_CFXMLDTDNodePtr node, const unsigned char* public
// Namespaces
_CFXMLNodePtr _Nonnull * _Nullable _CFXMLNamespaces(_CFXMLNodePtr node, CFIndex* count) {
*count = 0;
xmlNs* ns = ((xmlNode*)node)->ns;
xmlNs* ns = ((xmlNode*)node)->nsDef;
while (ns != NULL) {
(*count)++;
ns = ns->next;
}

_CFXMLNodePtr* result = calloc(*count, sizeof(_CFXMLNodePtr));
ns = ((xmlNode*)node)->ns;
ns = ((xmlNode*)node)->nsDef;
for (int i = 0; i < *count; i++) {
xmlNode* temp = xmlNewNode(ns, (unsigned char *)"");

Expand All @@ -1353,10 +1371,10 @@ _CFXMLNodePtr _Nonnull * _Nullable _CFXMLNamespaces(_CFXMLNodePtr node, CFIndex*

static inline void _removeAllNamespaces(xmlNodePtr node);
static inline void _removeAllNamespaces(xmlNodePtr node) {
xmlNsPtr ns = node->ns;
xmlNsPtr ns = node->nsDef;
if (ns != NULL) {
xmlFreeNsList(ns);
node->ns = NULL;
node->nsDef = NULL;
}
}

Expand All @@ -1368,8 +1386,8 @@ void _CFXMLSetNamespaces(_CFXMLNodePtr node, _CFXMLNodePtr* _Nullable nodes, CFI
}

xmlNodePtr nsNode = (xmlNodePtr)nodes[0];
((xmlNodePtr)node)->ns = xmlCopyNamespace(nsNode->ns);
xmlNsPtr currNs = ((xmlNodePtr)node)->ns;
((xmlNodePtr)node)->nsDef = xmlCopyNamespace(nsNode->ns);
xmlNsPtr currNs = ((xmlNodePtr)node)->nsDef;
for (CFIndex i = 1; i < count; i++) {
currNs->next = xmlCopyNamespace(((xmlNodePtr)nodes[i])->ns);
currNs = currNs->next;
Expand Down Expand Up @@ -1404,11 +1422,12 @@ CFStringRef _Nullable _CFXMLNamespaceCopyPrefix(_CFXMLNodePtr node) {
void _CFXMLNamespaceSetPrefix(_CFXMLNodePtr node, const char* prefix, int64_t length) {
xmlNsPtr ns = ((xmlNodePtr)node)->ns;

ns->prefix = xmlStrndup((const xmlChar*)prefix, length);
ns->prefix = xmlStrndup(_getNamespacePrefix(prefix), length);
}

_CFXMLNodePtr _CFXMLNewNamespace(const char* name, const char* stringValue) {
xmlNsPtr ns = xmlNewNs(NULL, (const xmlChar*)stringValue, (const xmlChar*)name);
const xmlChar* namespaceName = _getNamespacePrefix(name);
xmlNsPtr ns = xmlNewNs(NULL, (const xmlChar*)stringValue, namespaceName);
xmlNodePtr node = xmlNewNode(ns, (const xmlChar*)"");

node->type = _kCFXMLTypeNamespace;
Expand All @@ -1421,9 +1440,9 @@ void _CFXMLAddNamespace(_CFXMLNodePtr node, _CFXMLNodePtr nsNode) {
xmlNsPtr ns = xmlCopyNamespace(((xmlNodePtr)nsNode)->ns);
ns->context = nodePtr->doc;

xmlNsPtr currNs = nodePtr->ns;
xmlNsPtr currNs = nodePtr->nsDef;
if (currNs == NULL) {
nodePtr->ns = ns;
nodePtr->nsDef = ns;
return;
}

Expand All @@ -1436,15 +1455,16 @@ void _CFXMLAddNamespace(_CFXMLNodePtr node, _CFXMLNodePtr nsNode) {

void _CFXMLRemoveNamespace(_CFXMLNodePtr node, const char* prefix) {
xmlNodePtr nodePtr = (xmlNodePtr)node;
xmlNsPtr ns = nodePtr->ns;
if (ns != NULL && xmlStrcmp((const xmlChar*)prefix, ns->prefix) == 0) {
nodePtr->ns = ns->next;
xmlNsPtr ns = nodePtr->nsDef;
const xmlChar* prefixForLibxml2 = _getNamespacePrefix(prefix);
if (ns != NULL && _compareNamespacePrefix(prefixForLibxml2, ns->prefix) == 0) {
nodePtr->nsDef = ns->next;
xmlFreeNs(ns);
return;
}

while (ns->next != NULL) {
if (xmlStrcmp(ns->next->prefix, (const xmlChar*)prefix) == 0) {
if (_compareNamespacePrefix(ns->next->prefix, prefixForLibxml2) == 0) {
xmlNsPtr next = ns->next;
ns->next = ns->next->next;
xmlFreeNs(next);
Expand Down
2 changes: 1 addition & 1 deletion Foundation/XMLNode.swift
View file
Expand Up @@ -314,7 +314,7 @@ open class XMLNode: NSObject, NSCopying {
open var name: String? {
get {
if case .namespace = kind {
return _CFXMLNamespaceCopyPrefix(_xmlNode)?._swiftObject
return _CFXMLNamespaceCopyPrefix(_xmlNode)?._swiftObject ?? ""
}

return _CFXMLNodeCopyName(_xmlNode)?._swiftObject
Expand Down
30 changes: 19 additions & 11 deletions TestFoundation/TestXMLDocument.swift
View file
Expand Up @@ -379,18 +379,26 @@ class TestXMLDocument : LoopbackServerTest {
}

func test_addNamespace() {
let doc = XMLDocument(rootElement: XMLElement(name: "Foo"))
let ns = XMLNode.namespace(withName: "F", stringValue: "http://example.com/fakenamespace") as! XMLNode
doc.rootElement()?.addNamespace(ns)
XCTAssert((doc.rootElement()?.namespaces ?? []).map({ $0.stringValue ?? "foo" }).contains(ns.stringValue ?? "bar"), "namespaces didn't include the added namespace!")
XCTAssert(doc.rootElement()?.uri == "http://example.com/fakenamespace", "uri was \(doc.rootElement()?.uri ?? "null") instead of http://example.com/fakenamespace")
let element = XMLElement(name: "foo")
let xmlnsURI = "http://example.com/fakexmlns"
let xmlns = XMLNode.namespace(withName: "", stringValue: xmlnsURI) as! XMLNode
element.addNamespace(xmlns)
XCTAssert((element.namespaces ?? []).compactMap({ $0.stringValue }).contains(xmlnsURI), "namespaces didn't include the added namespace!")
XCTAssertEqual(element.uri, xmlnsURI, "uri was \(element.uri ?? "null") instead of \(xmlnsURI)")
XCTAssertEqual(element.xmlString(options:.nodeCompactEmptyElement), #"<foo xmlns="\#(xmlnsURI)"/>"#, "invalid namespace declaration.")

let otherNS = XMLNode.namespace(withName: "R", stringValue: "http://example.com/rnamespace") as! XMLNode
doc.rootElement()?.addNamespace(otherNS)
XCTAssert((doc.rootElement()?.namespaces ?? []).map({ $0.stringValue ?? "foo" }).contains(ns.stringValue ?? "bar"), "lost original namespace")
XCTAssert((doc.rootElement()?.namespaces ?? []).map({ $0.stringValue ?? "foo" }).contains(otherNS.stringValue ?? "bar"), "Lost new namespace")
doc.rootElement()?.addNamespace(XMLNode.namespace(withName: "R", stringValue: "http://example.com/rnamespace") as! XMLNode)
XCTAssert(doc.rootElement()?.namespaces?.count == 2, "incorrectly added a namespace with duplicate name!")
let otherURI = "http://example.com/fakenamespace"
let otherNS = XMLNode.namespace(withName: "other", stringValue: otherURI) as! XMLNode
element.addNamespace(otherNS)
XCTAssert((element.namespaces ?? []).compactMap({ $0.stringValue }).contains(xmlnsURI), "lost original namespace")
XCTAssert((element.namespaces ?? []).compactMap({ $0.stringValue }).contains(otherURI), "Lost new namespace")

let otherNS2 = XMLNode.namespace(withName: "other", stringValue: otherURI) as! XMLNode
element.addNamespace(otherNS2)
XCTAssertEqual(element.namespaces?.count, 2, "incorrectly added a namespace with duplicate name!")

let xmlString = element.xmlString(options:.nodeCompactEmptyElement)
XCTAssert(xmlString == #"<foo xmlns="\#(xmlnsURI)" xmlns:other="\#(otherURI)"/>"# || xmlString == #"<foo xmlns:other="\#(otherURI)" xmlns="\#(xmlnsURI)"/>"#, "unexpected namespace declaration: \(xmlString)")

let otherDoc = XMLDocument(rootElement: XMLElement(name: "Bar"))
otherDoc.rootElement()?.namespaces = [XMLNode.namespace(withName: "R", stringValue: "http://example.com/rnamespace") as! XMLNode, XMLNode.namespace(withName: "F", stringValue: "http://example.com/fakenamespace") as! XMLNode]
Expand Down

0 comments on commit fe53405

Please sign in to comment.