Roll libxslt to 891681e3e948f31732229f53cb6db7215f740fc7

third_party/libxslt/libxslt/variables.c

 /*
  * variables.c: Implementation of the variable storage and lookup
  *
  * Reference:
  *   http://www.w3.org/TR/1999/REC-xslt-19991116
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
@@ skipping 1427 matching lines @@
     style = ctxt->style;
 
 #ifdef WITH_XSLT_DEBUG_VARIABLE
     XSLT_TRACE(ctxt,XSLT_TRACE_VARIABLES,xsltGenericDebug(xsltGenericDebugContext,
             "Evaluating user parameter %s=%s\n", name, value));
 #endif
 
     /*
      * Name lookup
      */
+    href = NULL;
 
-    name = xsltSplitQName(ctxt->dict, name, &prefix);
-    href = NULL;
-    if (prefix != NULL) {
-        xmlNsPtr ns;
+    if (name[0] == '{') {
+        int len = 0;
 
-        ns = xmlSearchNs(style->doc, xmlDocGetRootElement(style->doc),
-                         prefix);
-        if (ns == NULL) {
-            xsltTransformError(ctxt, style, NULL,
-            "user param : no namespace bound to prefix %s\n", prefix);
-            href = NULL;
-        } else {
-            href = ns->href;
-        }
+        while ((name[len] != 0) && (name[len] != '}')) len++;
+        if (name[len] == 0) {
+           xsltTransformError(ctxt, style, NULL,
+           "user param : malformed parameter name : %s\n", name);
+        } else {
+           href = xmlDictLookup(ctxt->dict, &name[1], len-1);
+           name = xmlDictLookup(ctxt->dict, &name[len + 1], -1);
+       }
+    }
+    else {
+        name = xsltSplitQName(ctxt->dict, name, &prefix);
+        if (prefix != NULL) {
+            xmlNsPtr ns;
+
+            ns = xmlSearchNs(style->doc, xmlDocGetRootElement(style->doc),
+                             prefix);
+            if (ns == NULL) {
+                xsltTransformError(ctxt, style, NULL,
+                "user param : no namespace bound to prefix %s\n", prefix);
+                href = NULL;
+            } else {
+                href = ns->href;
+            }
+        }
     }
 
     if (name == NULL)
         return (-1);
 
     res_ptr = xmlHashLookup2(ctxt->globalVars, name, href);
     if (res_ptr != 0) {
         xsltTransformError(ctxt, style, NULL,
             "Global parameter %s already defined\n", name);
     }
@@ skipping 839 matching lines @@
 #ifdef WITH_XSLT_DEBUG_VARIABLE
         XSLT_TRACE(tctxt,XSLT_TRACE_VARIABLES,xsltGenericDebug(xsltGenericDebugContext,
             "found variable '%s'\n", name));
 #endif
     }
 
     return(valueObj);
 }