Roll libxslt to 891681e3e948f31732229f53cb6db7215f740fc7

third_party/libxslt/libexslt/strings.c

 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include <win32config.h>
 #else
 #include "config.h"
 #endif
 
 #include <libxml/tree.h>
@@ skipping 333 matching lines @@
 
 /**
  * exsltStrPaddingFunction:
  * @ctxt: an XPath parser context
  * @nargs: the number of arguments
  *
  * Creates a padding string of a certain length.
  */
 static void
 exsltStrPaddingFunction (xmlXPathParserContextPtr ctxt, int nargs) {
-    int number, str_len = 0;
-    xmlChar *str = NULL, *ret = NULL, *tmp;
+    int number, str_len = 0, str_size = 0;
+    xmlChar *str = NULL, *ret = NULL;
 
     if ((nargs < 1) || (nargs > 2)) {
         xmlXPathSetArityError(ctxt);
         return;
     }
 
     if (nargs == 2) {
         str = xmlXPathPopString(ctxt);
         str_len = xmlUTF8Strlen(str);
+        str_size = xmlStrlen(str);
     }
     if (str_len == 0) {
         if (str != NULL) xmlFree(str);
         str = xmlStrdup((const xmlChar *) " ");
         str_len = 1;
+        str_size = 1;
     }
 
     number = (int) xmlXPathPopNumber(ctxt);
 
     if (number <= 0) {
         xmlXPathReturnEmptyString(ctxt);
         xmlFree(str);
         return;
     }
 
     while (number >= str_len) {
-        ret = xmlStrncat(ret, str, str_len);
+        ret = xmlStrncat(ret, str, str_size);
         number -= str_len;
     }
-    tmp = xmlUTF8Strndup (str, number);
-    ret = xmlStrcat(ret, tmp);
-    if (tmp != NULL)
-        xmlFree (tmp);
+    if (number > 0) {
+        str_size = xmlUTF8Strsize(str, number);
+        ret = xmlStrncat(ret, str, str_size);
+    }
 
     xmlXPathReturnString(ctxt, ret);
 
     if (str != NULL)
         xmlFree(str);
 }
 
 /**
  * exsltStrAlignFunction:
  * @ctxt: an XPath parser context
@@ skipping 40 matching lines @@
             int right_start;
 
             ret = xmlUTF8Strndup (padding, left);
             ret = xmlStrcat (ret, str);
 
             right_start = xmlUTF8Strsize (padding, left + str_l);
             ret = xmlStrcat (ret, padding + right_start);
         } else {
             int str_s;
 
-            str_s = xmlStrlen (str);
+            str_s = xmlUTF8Strsize(padding, str_l);
             ret = xmlStrdup (str);
             ret = xmlStrcat (ret, padding + str_s);
         }
     }
 
     xmlXPathReturnString (ctxt, ret);
 
     xmlFree(str);
     xmlFree(padding);
     xmlFree(alignment);
@@ skipping 372 matching lines @@
                                    (const xmlChar *) "padding",
                                    (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
                                    exsltStrPaddingFunction)
         && !xmlXPathRegisterFuncNS(ctxt,
                                    (const xmlChar *) "align",
                                    (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
                                    exsltStrAlignFunction)
         && !xmlXPathRegisterFuncNS(ctxt,
                                    (const xmlChar *) "concat",
                                    (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
-                                   exsltStrConcatFunction)
-        && !xmlXPathRegisterFuncNS(ctxt,
-                                   (const xmlChar *) "replace",
-                                   (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
-                                   exsltStrReplaceFunction)) {
+                                   exsltStrConcatFunction)) {
         return 0;
     }
     return -1;
 }