Roll libxslt to 891681e3e948f31732229f53cb6db7215f740fc7

third_party/libxslt/libxslt/preproc.c

 /*
  * preproc.c: Preprocessing of style operations
  *
  * References:
  *   http://www.w3.org/TR/1999/REC-xslt-19991116
  *
  *   Michael Kay "XSLT Programmer's Reference" pp 637-643
  *   Writing Multiple Output Files
  *
  *   XSLT-1.1 Working Draft
@@ skipping 931 matching lines @@
                 *  in effect for the xsl:element element, including any default
                 *  namespace declaration.
                 */
                 ns = xmlSearchNs(inst->doc, inst, prefix);
                 if (ns != NULL) {
                     comp->ns = xmlDictLookup(style->dict, ns->href, -1);
                     comp->has_ns = 1;
 #ifdef XSLT_REFACTORED
                     comp->nsPrefix = prefix;
                     comp->name = name;
+#else
+                    (void)name; /* Suppress unused variable warning. */
 #endif
                 } else if (prefix != NULL) {
                     xsltTransformError(NULL, style, inst,
                         "xsl:element: The prefixed QName '%s' "
                         "has no namespace binding in scope in the "
                         "stylesheet; this is an error, since the namespace was "
                         "not specified by the instruction itself.\n", comp->name);
                     style->errors++;
                 }
             }
@@ skipping 105 matching lines @@
                     *  namespace declarations in effect for the xsl:element
                     *  element, including any default namespace declaration.
                     */
                     ns = xmlSearchNs(inst->doc, inst, prefix);
                     if (ns != NULL) {
                         comp->ns = xmlDictLookup(style->dict, ns->href, -1);
                         comp->has_ns = 1;
 #ifdef XSLT_REFACTORED
                         comp->nsPrefix = prefix;
                         comp->name = name;
+#else
+                        (void)name; /* Suppress unused variable warning. */
 #endif
                     } else {
                         xsltTransformError(NULL, style, inst,
                             "xsl:attribute: The prefixed QName '%s' "
                             "has no namespace binding in scope in the "
                             "stylesheet; this is an error, since the "
                             "namespace was not specified by the instruction "
                             "itself.\n", comp->name);
                         style->errors++;
                     }
@@ skipping 207 matching lines @@
             style->errors++;
             return;
         } else {
             /*
             * @prop will be in the string dict afterwards, @URI not.
             */
             URI = xsltGetQNameURI2(style, inst, &prop);
             if (prop == NULL) {
                 style->errors++;
             } else {
-                *localName = prop;
+                if (localName)
+                    *localName = prop;
                 if (hasProp)
                     *hasProp = 1;
                 if (URI != NULL) {
                     /*
                     * Fixes bug #308441: Put the ns-name in the dict
                     * in order to pointer compare names during XPath's
                     * variable lookup.
                     */
                     if (nsName)
                         *nsName = xmlDictLookup(style->dict, URI, -1);
@@ skipping 923 matching lines @@
             xsltChooseComp(style, inst);
         } else if (IS_XSLT_NAME(inst, "for-each")) {
             xsltCheckInstructionElement(style, inst);
             xsltForEachComp(style, inst);
         } else if (IS_XSLT_NAME(inst, "apply-imports")) {
             xsltCheckInstructionElement(style, inst);
             xsltApplyImportsComp(style, inst);
         } else if (IS_XSLT_NAME(inst, "attribute")) {
             xmlNodePtr parent = inst->parent;
 
-            if ((parent == NULL) || (parent->ns == NULL) ||
+            if ((parent == NULL) ||
+                (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
                 ((parent->ns != inst->ns) &&
                  (!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
                 (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
                 xsltCheckInstructionElement(style, inst);
             }
             xsltAttributeComp(style, inst);
         } else if (IS_XSLT_NAME(inst, "element")) {
             xsltCheckInstructionElement(style, inst);
             xsltElementComp(style, inst);
         } else if (IS_XSLT_NAME(inst, "text")) {
@@ skipping 105 matching lines @@
 
         /*
          * Unknown element, maybe registered at the context
          * level. Mark it for later recognition.
          */
         if (inst->psvi == NULL)
             inst->psvi = (void *) xsltExtMarker;
     }
 }
 #endif /* XSLT_REFACTORED */