Roll libxslt to 891681e3e948f31732229f53cb6db7215f740fc7

third_party/libxslt/libxslt/attributes.c

 /*
  * attributes.c: Implementation of the XSLT attributes handling
  *
  * Reference:
  *   http://www.w3.org/TR/1999/REC-xslt-19991116
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
@@ skipping 279 matching lines @@
     const xmlChar *ncname;
     const xmlChar *prefix;
     xmlChar *value;
     xmlNodePtr child;
     xsltAttrElemPtr attrItems;
 
     if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
         return;
 
     value = xmlGetNsProp(cur, (const xmlChar *)"name", NULL);
-    if (value == NULL) {
+    if ((value == NULL) || (*value == 0)) {
         xsltGenericError(xsltGenericErrorContext,
              "xsl:attribute-set : name is missing\n");
+        if (value)
+            xmlFree(value);
         return;
     }
 
     ncname = xsltSplitQName(style->dict, value, &prefix);
     xmlFree(value);
     value = NULL;
 
     if (style->attributeSets == NULL) {
 #ifdef WITH_XSLT_DEBUG_ATTRIBUTES
         xsltGenericDebug(xsltGenericDebugContext,
@@ skipping 162 matching lines @@
     while (style != NULL) {
         values = xmlHashLookup2(style->attributeSets, name, ns);
         if (values != NULL)
             return(values);
         style = xsltNextImport(style);
     }
     return(NULL);
 }
 
 /**
- * xsltResolveSASCallback,:
+ * xsltResolveSASCallbackInt:
  * @style:  the XSLT stylesheet
  *
  * resolve the references in an attribute set.
  */
 static void
-xsltResolveSASCallback(xsltAttrElemPtr values, xsltStylesheetPtr style,
+xsltResolveSASCallbackInt(xsltAttrElemPtr values, xsltStylesheetPtr style,
                        const xmlChar *name, const xmlChar *ns,
-                       ATTRIBUTE_UNUSED const xmlChar *ignored) {
+                       int depth) {
     xsltAttrElemPtr tmp;
     xsltAttrElemPtr refs;
 
     tmp = values;
+    if ((name == NULL) || (name[0] == 0))
+        return;
+    if (depth > 100) {
+        xsltGenericError(xsltGenericErrorContext,
+        "xsl:attribute-set : use-attribute-sets recursion detected on %s\n",
+                         name);
+        return;
+    }
     while (tmp != NULL) {
         if (tmp->set != NULL) {
             /*
              * Check against cycles !
              */
             if ((xmlStrEqual(name, tmp->set)) && (xmlStrEqual(ns, tmp->ns))) {
                 xsltGenericError(xsltGenericErrorContext,
      "xsl:attribute-set : use-attribute-sets recursion detected on %s\n",
                                  name);
             } else {
 #ifdef WITH_XSLT_DEBUG_ATTRIBUTES
                 xsltGenericDebug(xsltGenericDebugContext,
                         "Importing attribute list %s\n", tmp->set);
 #endif
 
                 refs = xsltGetSAS(style, tmp->set, tmp->ns);
                 if (refs == NULL) {
                     xsltGenericError(xsltGenericErrorContext,
      "xsl:attribute-set : use-attribute-sets %s reference missing %s\n",
                                      name, tmp->set);
                 } else {
                     /*
                      * recurse first for cleanup
                      */
-                    xsltResolveSASCallback(refs, style, name, ns, NULL);
+                    xsltResolveSASCallbackInt(refs, style, name, ns, depth + 1);
                     /*
                      * Then merge
                      */
                     xsltMergeAttrElemList(style, values, refs);
                     /*
                      * Then suppress the reference
                      */
                     tmp->set = NULL;
                     tmp->ns = NULL;
                 }
             }
         }
         tmp = tmp->next;
     }
 }
 
 /**
+ * xsltResolveSASCallback,:
+ * @style:  the XSLT stylesheet
+ *
+ * resolve the references in an attribute set.
+ */
+static void
+xsltResolveSASCallback(xsltAttrElemPtr values, xsltStylesheetPtr style,
+                       const xmlChar *name, const xmlChar *ns,
+                       ATTRIBUTE_UNUSED const xmlChar *ignored) {
+    xsltResolveSASCallbackInt(values, style, name, ns, 1);
+}
+
+/**
  * xsltMergeSASCallback,:
  * @style:  the XSLT stylesheet
  *
  * Merge an attribute set from an imported stylesheet.
  */
 static void
 xsltMergeSASCallback(xsltAttrElemPtr values, xsltStylesheetPtr style,
                        const xmlChar *name, const xmlChar *ns,
                        ATTRIBUTE_UNUSED const xmlChar *ignored) {
     int ret;
@@ skipping 580 matching lines @@
  *
  * Free up the memory used by attribute sets
  */
 void
 xsltFreeAttributeSetsHashes(xsltStylesheetPtr style) {
     if (style->attributeSets != NULL)
         xmlHashFree((xmlHashTablePtr) style->attributeSets,
                     (xmlHashDeallocator) xsltFreeAttrElemList);
     style->attributeSets = NULL;
 }