Roll libxml to e905f08123e4a6e7731549e6f09dadff4cab65bd

third_party/libxml/src/xpointer.c

 /*
  * xpointer.c : Code to handle XML Pointer
  *
  * Base implementation was made accordingly to
  * W3C Candidate Recommendation 7 June 2000
  * http://www.w3.org/TR/2000/CR-xptr-20000607
  *
  * Added support for the element() scheme described in:
  * W3C Proposed Recommendation 13 November 2002
  * http://www.w3.org/TR/2002/PR-xptr-element-20021113/
@@ skipping 524 matching lines @@
             endIndex = end->index;
             break;
         case XPATH_RANGE:
             endNode = end->user2;
             endIndex = end->index2;
             break;
         case XPATH_NODESET:
             /*
              * Empty set ...
              */
-            if (end->nodesetval->nodeNr <= 0)
+            if ((end->nodesetval == NULL) || (end->nodesetval->nodeNr <= 0))
                 return(NULL);
             endNode = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1];
             endIndex = -1;
             break;
         default:
             /* TODO */
             return(NULL);
     }
 
     ret = xmlXPtrNewRangeInternal(start, -1, endNode, endIndex);
@@ skipping 798 matching lines @@
     do {
         tmp = valuePop(ctxt);
         if (tmp != NULL) {
             if (tmp != init) {
                 if (tmp->type == XPATH_NODESET) {
                     /*
                      * Evaluation may push a root nodeset which is unused
                      */
                     xmlNodeSetPtr set;
                     set = tmp->nodesetval;
-                    if ((set->nodeNr != 1) ||
+                    if ((set == NULL) || (set->nodeNr != 1) ||
                         (set->nodeTab[0] != (xmlNodePtr) ctx->doc))
                         stack++;
                 } else
                     stack++;
             }
             xmlXPathFreeObject(tmp);
         }
     } while (tmp != NULL);
     if (stack != 0) {
         xmlXPtrErr(ctxt, XML_XPTR_EXTRA_OBJECTS,
@@ skipping 414 matching lines @@
             if (tmp == NULL)
                 continue;
             point = NULL;
             switch (tmp->type) {
                 case XPATH_POINT:
                     point = xmlXPtrNewPoint(tmp->user, tmp->index);
                     break;
                 case XPATH_RANGE: {
                     xmlNodePtr node = tmp->user;
                     if (node != NULL) {
-                        if (node->type == XML_ATTRIBUTE_NODE) {
-                            /* TODO: Namespace Nodes ??? */
+                        if ((node->type == XML_ATTRIBUTE_NODE) ||
+                            (node->type == XML_NAMESPACE_DECL)) {
                             xmlXPathFreeObject(obj);
                             xmlXPtrFreeLocationSet(newset);
                             XP_ERROR(XPTR_SYNTAX_ERROR);
                         }
                         point = xmlXPtrNewPoint(node, tmp->index);
                     }
                     break;
                 }
                 default:
                     /*** Should we raise an error ?
@@ skipping 74 matching lines @@
             if (tmp == NULL)
                 continue;
             point = NULL;
             switch (tmp->type) {
                 case XPATH_POINT:
                     point = xmlXPtrNewPoint(tmp->user, tmp->index);
                     break;
                 case XPATH_RANGE: {
                     xmlNodePtr node = tmp->user2;
                     if (node != NULL) {
-                        if (node->type == XML_ATTRIBUTE_NODE) {
-                            /* TODO: Namespace Nodes ??? */
+                        if ((node->type == XML_ATTRIBUTE_NODE) ||
+                            (node->type == XML_NAMESPACE_DECL)) {
                             xmlXPathFreeObject(obj);
                             xmlXPtrFreeLocationSet(newset);
                             XP_ERROR(XPTR_SYNTAX_ERROR);
                         }
                         point = xmlXPtrNewPoint(node, tmp->index2);
                     } else if (tmp->user == NULL) {
                         point = xmlXPtrNewPoint(node,
                                        xmlXPtrNbLocChildren(node));
                     }
                     break;
@@ skipping 120 matching lines @@
     oldset = (xmlLocationSetPtr) set->user;
 
     /*
      * The loop is to compute the covering range for each item and add it
      */
     newset = xmlXPtrLocationSetCreate(NULL);
     if (newset == NULL) {
         xmlXPathFreeObject(set);
         XP_ERROR(XPATH_MEMORY_ERROR);
     }
-    for (i = 0;i < oldset->locNr;i++) {
-        xmlXPtrLocationSetAdd(newset,
-                xmlXPtrCoveringRange(ctxt, oldset->locTab[i]));
+    if (oldset != NULL) {
+        for (i = 0;i < oldset->locNr;i++) {
+            xmlXPtrLocationSetAdd(newset,
+                    xmlXPtrCoveringRange(ctxt, oldset->locTab[i]));
+        }
     }
 
     /*
      * Save the new value and cleanup
      */
     valuePush(ctxt, xmlXPtrWrapLocationSet(newset));
     xmlXPathFreeObject(set);
 }
 
 /**
@@ skipping 871 matching lines @@
     }
 
     NEXT;
     SKIP_BLANKS;
 }
 
 #define bottom_xpointer
 #include "elfgcchack.h"
 #endif