* fix for ns missing prefix or uri

* range for NSXML
itod · May 29, 2015 · a462302 · a462302
1 parent b809c7e
commit a462302
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/nsxml/XPNSXMLNodeImpl.m b/nsxml/XPNSXMLNodeImpl.m
@@ -196,6 +196,11 @@ - (NSString *)namespaceURI {
 }
 
 
+- (NSRange)range {
+    return NSMakeRange(0, [[self.node XMLString] length]);
+}
+
+
 - (id <XPNodeInfo>)parent {
     XPAssert(self.node);
 

diff --git a/src/XPStandaloneContext.m b/src/XPStandaloneContext.m
@@ -258,7 +258,9 @@ - (BOOL)defineUserFunction:(XPUserFunction *)fn error:(NSError **)outErr {
     XPAssert([fn.name length]);
     XPAssert(_userFunctions);
 
-    _userFunctions[fn.name] = fn;
+    if (fn && fn.name) {
+        _userFunctions[fn.name] = fn;
+    }
 
     return YES;
 }
@@ -291,7 +293,9 @@ - (void)declareSystemFunction:(Class)cls forName:(NSString *)name {
     XPAssert([name length]);
     XPAssert(_functions);
 
-    _functions[name] = cls;
+    if (name && cls) {
+        _functions[name] = cls;
+    }
 }
 
 
@@ -303,7 +307,10 @@ - (void)declareNamespaceURI:(NSString *)uri forPrefix:(NSString *)prefix {
     NSParameterAssert(uri);
     NSParameterAssert(prefix);
     XPAssert(_namespaces);
-    _namespaces[prefix] = uri;
+
+    if (prefix && uri) {
+        _namespaces[prefix] = uri;
+    }
 }