Roll libxslt to 891681e3e948f31732229f53cb6db7215f740fc7

third_party/libxslt/libxslt/functions.c

 /*
  * functions.c: Implementation of the XSLT extra functions
  *
  * Reference:
  *   http://www.w3.org/TR/1999/REC-xslt-19991116
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  * Bjorn Reese <breese@users.sourceforge.net> for number formatting
@@ skipping 162 matching lines @@
     xptrctxt = xmlXPtrNewContext(doc, NULL, NULL);
     if (xptrctxt == NULL) {
         xsltTransformError(tctxt, NULL, NULL,
             "document() : internal error xptrctxt == NULL\n");
         goto out_fragment;
     }
 
     resObj = xmlXPtrEval(fragment, xptrctxt);
     xmlXPathFreeContext(xptrctxt);
 #endif
-    xmlFree(fragment);
 
     if (resObj == NULL)
         goto out_fragment;
 
     switch (resObj->type) {
         case XPATH_NODESET:
             break;
         case XPATH_UNDEFINED:
         case XPATH_BOOLEAN:
         case XPATH_NUMBER:
         case XPATH_STRING:
         case XPATH_POINT:
         case XPATH_USERS:
         case XPATH_XSLT_TREE:
         case XPATH_RANGE:
         case XPATH_LOCATIONSET:
             xsltTransformError(tctxt, NULL, NULL,
                 "document() : XPointer does not select a node set: #%s\n",
                 fragment);
         goto out_object;
     }
 
     valuePush(ctxt, resObj);
+    xmlFree(fragment);
     return;
 
 out_object:
     xmlXPathFreeObject(resObj);
 
 out_fragment:
     valuePush(ctxt, xmlXPathNewNodeSet(NULL));
+    xmlFree(fragment);
 }
 
 /**
  * xsltDocumentFunction:
  * @ctxt:  the XPath Parser context
  * @nargs:  the number of arguments
  *
  * Implement the document() XSLT function
  *   node-set document(object, node-set?)
  */
@@ skipping 434 matching lines @@
  * Implement the generate-id() XSLT function
  *   string generate-id(node-set?)
  */
 void
 xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
     static char base_address;
     xmlNodePtr cur = NULL;
     xmlXPathObjectPtr obj = NULL;
     long val;
     xmlChar str[30];
-    xmlDocPtr doc;
 
     if (nargs == 0) {
         cur = ctxt->context->node;
     } else if (nargs == 1) {
         xmlNodeSetPtr nodelist;
         int i, ret;
 
         if ((ctxt->value == NULL) || (ctxt->value->type != XPATH_NODESET)) {
             ctxt->error = XPATH_INVALID_TYPE;
             xsltTransformError(xsltXPathGetTransformContext(ctxt), NULL, NULL,
@@ skipping 12 matching lines @@
             ret = xmlXPathCmpNodes(cur, nodelist->nodeTab[i]);
             if (ret == -1)
                 cur = nodelist->nodeTab[i];
         }
     } else {
         xsltTransformError(xsltXPathGetTransformContext(ctxt), NULL, NULL,
                 "generate-id() : invalid number of args %d\n", nargs);
         ctxt->error = XPATH_INVALID_ARITY;
         return;
     }
-    /*
-     * Okay this is ugly but should work, use the NodePtr address
-     * to forge the ID
-     */
-    if (cur->type != XML_NAMESPACE_DECL)
-        doc = cur->doc;
-    else {
-        xmlNsPtr ns = (xmlNsPtr) cur;
-
-        if (ns->context != NULL)
-            doc = ns->context;
-        else
-            doc = ctxt->context->doc;
-
-    }
 
     if (obj)
         xmlXPathFreeObject(obj);
 
     val = (long)((char *)cur - (char *)&base_address);
     if (val >= 0) {
-      sprintf((char *)str, "idp%ld", val);
+      snprintf((char *)str, sizeof(str), "idp%ld", val);
     } else {
-      sprintf((char *)str, "idm%ld", -val);
+      snprintf((char *)str, sizeof(str), "idm%ld", -val);
     }
     valuePush(ctxt, xmlXPathNewString(str));
 }
 
 /**
  * xsltSystemPropertyFunction:
  * @ctxt:  the XPath Parser context
  * @nargs:  the number of arguments
  *
  * Implement the system-property() XSLT function
@@ skipping 259 matching lines @@
                          xsltFormatNumberFunction);
     xmlXPathRegisterFunc(ctxt, (const xmlChar *) "generate-id",
                          xsltGenerateIdFunction);
     xmlXPathRegisterFunc(ctxt, (const xmlChar *) "system-property",
                          xsltSystemPropertyFunction);
     xmlXPathRegisterFunc(ctxt, (const xmlChar *) "element-available",
                          xsltElementAvailableFunction);
     xmlXPathRegisterFunc(ctxt, (const xmlChar *) "function-available",
                          xsltFunctionAvailableFunction);
 }