Roll libxslt to 891681e3e948f31732229f53cb6db7215f740fc7

third_party/libxslt/libexslt/functions.c

 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include <win32config.h>
 #else
 #include "config.h"
 #endif
 
 #include <string.h>
@@ skipping 94 matching lines @@
     if ((data == NULL) || (ch == NULL) || (URI == NULL) || (name == NULL))
             return;
 
     if (ch->ctxt == NULL || ch->hash == NULL)
         return;
 
     /* Check if already present */
     func = (exsltFuncFunctionData*)xmlHashLookup2(ch->hash, URI, name);
     if (func == NULL) {         /* Not yet present - copy it in */
         func = exsltFuncNewFunctionData();
+        if (func == NULL)
+            return;
         memcpy(func, data, sizeof(exsltFuncFunctionData));
         if (xmlHashAddEntry2(ch->hash, URI, name, func) < 0) {
             xsltGenericError(xsltGenericErrorContext,
                     "Failed to register function {%s}%s\n",
                     URI, name);
         } else {                /* Do the registration */
             xsltGenericDebug(xsltGenericDebugContext,
                     "exsltFuncRegisterImportFunc: register {%s}%s\n",
                     URI, name);
             xsltRegisterExtFunction(ch->ctxt, name, URI,
@@ skipping 169 matching lines @@
      * retrieve func:function template
      */
     data = (exsltFuncData *) xsltGetExtData (tctxt,
                                              EXSLT_FUNCTIONS_NAMESPACE);
     oldResult = data->result;
     data->result = NULL;
 
     func = (exsltFuncFunctionData*) xmlHashLookup2 (data->funcs,
                                                     ctxt->context->functionURI,
                                                     ctxt->context->function);
+    if (func == NULL) {
+        /* Should never happen */
+        xsltGenericError(xsltGenericErrorContext,
+                         "{%s}%s: not found\n",
+                         ctxt->context->functionURI, ctxt->context->function);
+        ctxt->error = XPATH_UNKNOWN_FUNC_ERROR;
+        return;
+    }
 
     /*
      * params handling
      */
     if (nargs > func->nargs) {
         xsltGenericError(xsltGenericErrorContext,
                          "{%s}%s: called with too many arguments\n",
                          ctxt->context->functionURI, ctxt->context->function);
         ctxt->error = XPATH_INVALID_ARITY;
         return;
@@ skipping 173 matching lines @@
         return;
     }
     xmlFree(prefix);
 
     xsltParseTemplateContent(style, inst);
 
     /*
      * Create function data
      */
     func = exsltFuncNewFunctionData();
+    if (func == NULL) {
+        xmlFree(name);
+        return;
+    }
     func->content = inst->children;
     while (IS_XSLT_ELEM(func->content) &&
            IS_XSLT_NAME(func->content, "param")) {
         func->content = func->content->next;
         func->nargs++;
     }
 
     /*
      * Register the function data such that it can be retrieved
      * by exslFuncFunctionFunction
@@ skipping 265 matching lines @@
                        (xsltStyleExtShutdownFunction) exsltFuncStyleShutdown);
 
     xsltRegisterExtModuleTopLevel ((const xmlChar *) "function",
                                    EXSLT_FUNCTIONS_NAMESPACE,
                                    exsltFuncFunctionComp);
     xsltRegisterExtModuleElement ((const xmlChar *) "result",
                           EXSLT_FUNCTIONS_NAMESPACE,
                           (xsltPreComputeFunction)exsltFuncResultComp,
                           (xsltTransformFunction) exsltFuncResultElem);
 }