Roll libxslt to ac341cbd792ee572941cc9a66e73800219a1a386

third_party/libxslt/libxslt/xslt.c

 /*
  * xslt.c: Implemetation of an XSL Transformation 1.0 engine
  *
  * Reference:
  *   XSLT specification
  *   http://www.w3.org/TR/1999/REC-xslt-19991116
  *
  *   Associating Style Sheets with XML documents
  *   http://www.w3.org/1999/06/REC-xml-stylesheet-19990629
  *
@@ skipping 257 matching lines @@
     }
     return(1);
 }
 
 /************************************************************************
  *                                                                      *
  *              Routines to handle XSLT data structures                 *
  *                                                                      *
  ************************************************************************/
 static xsltDecimalFormatPtr
-xsltNewDecimalFormat(xmlChar *name)
+xsltNewDecimalFormat(const xmlChar *nsUri, xmlChar *name)
 {
     xsltDecimalFormatPtr self;
     /* UTF-8 for 0x2030 */
     static const xmlChar permille[4] = {0xe2, 0x80, 0xb0, 0};
 
     self = xmlMalloc(sizeof(xsltDecimalFormat));
     if (self != NULL) {
         self->next = NULL;
+        self->nsUri = nsUri;
         self->name = name;
 
         /* Default values */
         self->digit = xmlStrdup(BAD_CAST("#"));
         self->patternSeparator = xmlStrdup(BAD_CAST(";"));
         self->decimalPoint = xmlStrdup(BAD_CAST("."));
         self->grouping = xmlStrdup(BAD_CAST(","));
         self->percent = xmlStrdup(BAD_CAST("%"));
         self->permille = xmlStrdup(BAD_CAST(permille));
         self->zeroDigit = xmlStrdup(BAD_CAST("0"));
@@ skipping 65 matching lines @@
 {
     xsltDecimalFormatPtr result = NULL;
 
     if (name == NULL)
         return style->decimalFormat;
 
     while (style != NULL) {
         for (result = style->decimalFormat->next;
              result != NULL;
              result = result->next) {
-            if (xmlStrEqual(name, result->name))
+            if ((result->nsUri == NULL) && xmlStrEqual(name, result->name))
                 return result;
         }
         style = xsltNextImport(style);
+    }
+    return result;
+}
+
+/**
+ * xsltDecimalFormatGetByQName:
+ * @style: the XSLT stylesheet
+ * @nsUri: the namespace URI of the QName
+ * @name: the local part of the QName
+ *
+ * Find decimal-format by QName
+ *
+ * Returns the xsltDecimalFormatPtr
+ */
+xsltDecimalFormatPtr
+xsltDecimalFormatGetByQName(xsltStylesheetPtr style, const xmlChar *nsUri,
+                            const xmlChar *name)
+{
+    xsltDecimalFormatPtr result = NULL;
+
+    if (name == NULL)
+        return style->decimalFormat;
+
+    while (style != NULL) {
+        for (result = style->decimalFormat->next;
+             result != NULL;
+             result = result->next) {
+            if (xmlStrEqual(nsUri, result->nsUri) &&
+                xmlStrEqual(name, result->name))
+                return result;
+        }
+        style = xsltNextImport(style);
     }
     return result;
 }
 
 
 /**
  * xsltNewTemplate:
  *
  * Create a new XSLT Template
  *
@@ skipping 354 matching lines @@
     ret = (xsltStylesheetPtr) xmlMalloc(sizeof(xsltStylesheet));
     if (ret == NULL) {
         xsltTransformError(NULL, NULL, NULL,
                 "xsltNewStylesheet : malloc failed\n");
         goto internal_err;
     }
     memset(ret, 0, sizeof(xsltStylesheet));
 
     ret->omitXmlDeclaration = -1;
     ret->standalone = -1;
-    ret->decimalFormat = xsltNewDecimalFormat(NULL);
+    ret->decimalFormat = xsltNewDecimalFormat(NULL, NULL);
     ret->indent = -1;
     ret->errors = 0;
     ret->warnings = 0;
     ret->exclPrefixNr = 0;
     ret->exclPrefixMax = 0;
     ret->exclPrefixTab = NULL;
     ret->extInfos = NULL;
     ret->extrasNr = 0;
     ret->internalized = 1;
     ret->literal_result = 0;
@@ skipping 616 matching lines @@
     xsltDecimalFormatPtr format;
     xsltDecimalFormatPtr iter;
 
     if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
         return;
 
     format = style->decimalFormat;
 
     prop = xmlGetNsProp(cur, BAD_CAST("name"), NULL);
     if (prop != NULL) {
-        format = xsltDecimalFormatGetByName(style, prop);
+        const xmlChar *nsUri;
+
+        if (xmlValidateQName(prop, 0) != 0) {
+            xsltTransformError(NULL, style, cur,
+                "xsl:decimal-format: Invalid QName '%s'.\n", prop);
+            style->warnings++;
+            xmlFree(prop);
+            return;
+        }
+        /*
+        * TODO: Don't use xsltGetQNameURI().
+        */
+        nsUri = xsltGetQNameURI(cur, &prop);
+        if (prop == NULL) {
+            style->warnings++;
+            return;
+        }
+        format = xsltDecimalFormatGetByQName(style, nsUri, prop);
         if (format != NULL) {
             xsltTransformError(NULL, style, cur,
          "xsltParseStylestyleDecimalFormat: %s already exists\n", prop);
-            if (style != NULL) style->warnings++;
+            style->warnings++;
+            xmlFree(prop);
             return;
         }
-        format = xsltNewDecimalFormat(prop);
+        format = xsltNewDecimalFormat(nsUri, prop);
         if (format == NULL) {
             xsltTransformError(NULL, style, cur,
      "xsltParseStylestyleDecimalFormat: failed creating new decimal-format\n");
-            if (style != NULL) style->errors++;
+            style->errors++;
+            xmlFree(prop);
             return;
         }
         /* Append new decimal-format structure */
         for (iter = style->decimalFormat; iter->next; iter = iter->next)
             ;
         if (iter)
             iter->next = format;
     }
 
     prop = xmlGetNsProp(cur, (const xmlChar *)"decimal-separator", NULL);
@@ skipping 5572 matching lines @@
                 ret = xsltParseStylesheetFile(href);
             }
             if (base != NULL)
                 xmlFree(base);
         }
         xmlFreeURI(URI);
         xmlFree(href);
     }
     return(ret);
 }