Upgrade to libxml 2.9.2 and libxslt 1.1.28

third_party/libxslt/libxslt/xsltlocale.c

 /*
  * xsltlocale.c: locale handling
  *
  * Reference:
  * RFC 3066: Tags for the Identification of Languages
  * http://www.ietf.org/rfc/rfc3066.txt
  * ISO 639-1, ISO 3166-1
  *
  * Author: Nick Wellnhofer
  * winapi port: Roumen Petrov
  */
 
 #define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>
 #include <libxml/xmlmemory.h>
 
 #include "xsltlocale.h"
 #include "xsltutils.h"
 
 #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 2
 #define newlocale __newlocale
 #define freelocale __freelocale
 #define strxfrm_l __strxfrm_l
 #define LC_COLLATE_MASK (1 << LC_COLLATE)
 #endif
 
-#define ISALPHA(c) ((c & 0xc0) == 0x40 && (unsigned)((c & 0x1f) - 1) < 26)
 #define TOUPPER(c) (c & ~0x20)
 #define TOLOWER(c) (c | 0x20)
+#define ISALPHA(c) ((unsigned)(TOUPPER(c) - 'A') < 26)
 
 /*without terminating null character*/
 #define XSLTMAX_ISO639LANGLEN           8
 #define XSLTMAX_ISO3166CNTRYLEN         8
                                         /* <lang>-<cntry> */
 #define XSLTMAX_LANGTAGLEN              (XSLTMAX_ISO639LANGLEN+1+XSLTMAX_ISO3166CNTRYLEN)
 
 static const xmlChar* xsltDefaultRegion(const xmlChar *localeName);
 
 #ifdef XSLT_LOCALE_WINAPI
@@ skipping 18 matching lines @@
 
     for (k=0; k<xsltLocaleListSize; k++, p++)
         if (xmlStrcmp(p->tag, languageTag) == 0) return p->lcid;
     return((xsltLocale)0);
 }
 
 static void xsltEnumSupportedLocales(void);
 #endif
 
 /**
+ * xsltFreeLocales:
+ *
+ * Cleanup function for the locale support on shutdown
+ */
+void
+xsltFreeLocales(void) {
+#ifdef XSLT_LOCALE_WINAPI
+    xmlRMutexLock(xsltLocaleMutex);
+    xmlFree(xsltLocaleList);
+    xsltLocaleList = NULL;
+    xmlRMutexUnlock(xsltLocaleMutex);
+#endif
+}
+
+/**
  * xsltNewLocale:
  * @languageTag: RFC 3066 language tag
  *
  * Creates a new locale of an opaque system dependent type based on the
  * language tag.
  *
  * Returns the locale or NULL on error or if no matching locale was found
  */
 xsltLocale
 xsltNewLocale(const xmlChar *languageTag) {
 #ifdef XSLT_LOCALE_XLOCALE
     xsltLocale locale;
     char localeName[XSLTMAX_LANGTAGLEN+6]; /* 6 chars for ".utf8\0" */
     const xmlChar *p = languageTag;
     const char *region = NULL;
     char *q = localeName;
     int i, llen;
-    
+
     /* Convert something like "pt-br" to "pt_BR.utf8" */
-    
+
     if (languageTag == NULL)
-        return(NULL);
-    
+        return(NULL);
+
     for (i=0; i<XSLTMAX_ISO639LANGLEN && ISALPHA(*p); ++i)
         *q++ = TOLOWER(*p++);
-    
+
     if (i == 0)
-        return(NULL);
-    
+        return(NULL);
+
     llen = i;
-    *q++ = '_';
-    
+
     if (*p) {
-        if (*p++ != '-')
-            return(NULL);
-        
+        if (*p++ != '-')
+            return(NULL);
+        *q++ = '_';
+
         for (i=0; i<XSLTMAX_ISO3166CNTRYLEN && ISALPHA(*p); ++i)
             *q++ = TOUPPER(*p++);
-    
-        if (i == 0 || *p)
-            return(NULL);
-        
+
+        if (i == 0 || *p)
+            return(NULL);
+
         memcpy(q, ".utf8", 6);
         locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
         if (locale != NULL)
             return(locale);
-        
+
         /* Continue without using country code */
-        
-        q = localeName + llen + 1;
+
+        q = localeName + llen;
     }
-    
+
     /* Try locale without territory, e.g. for Esperanto (eo) */
 
     memcpy(q, ".utf8", 6);
     locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
     if (locale != NULL)
         return(locale);
 
     /* Try to find most common country for language */
-    
+
     if (llen != 2)
         return(NULL);
 
     region = (char *)xsltDefaultRegion((xmlChar *)localeName);
     if (region == NULL)
         return(NULL);
-     
-    q = localeName + llen + 1;
+
+    q = localeName + llen;
+    *q++ = '_';
     *q++ = region[0];
     *q++ = region[1];
     memcpy(q, ".utf8", 6);
     locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
-    
+
     return(locale);
 #endif
 
 #ifdef XSLT_LOCALE_WINAPI
 {
     xsltLocale    locale = (xsltLocale)0;
     xmlChar       localeName[XSLTMAX_LANGTAGLEN+1];
     xmlChar       *q = localeName;
     const xmlChar *p = languageTag;
     int           i, llen;
     const xmlChar *region = NULL;
 
     if (languageTag == NULL) goto end;
 
     xsltEnumSupportedLocales();
 
     for (i=0; i<XSLTMAX_ISO639LANGLEN && ISALPHA(*p); ++i)
         *q++ = TOLOWER(*p++);
     if (i == 0) goto end;
 
     llen = i;
     *q++ = '-';
     if (*p) { /*if country tag is given*/
         if (*p++ != '-') goto end;
-        
+
         for (i=0; i<XSLTMAX_ISO3166CNTRYLEN && ISALPHA(*p); ++i)
             *q++ = TOUPPER(*p++);
         if (i == 0 || *p) goto end;
 
         *q = '\0';
         locale = xslt_locale_WINAPI(localeName);
         if (locale != (xsltLocale)0) goto end;
     }
     /* Try to find most common country for language */
     region = xsltDefaultRegion(localeName);
     if (region == NULL) goto end;
 
     strcpy(localeName + llen + 1, region);
     locale = xslt_locale_WINAPI(localeName);
 end:
     return(locale);
 }
 #endif
 
 #ifdef XSLT_LOCALE_NONE
     return(NULL);
 #endif
 }
 
 static const xmlChar*
 xsltDefaultRegion(const xmlChar *localeName) {
     xmlChar c;
     /* region should be xmlChar, but gcc warns on all string assignments */
     const char *region = NULL;
-    
+
     c = localeName[1];
     /* This is based on the locales from glibc 2.3.3 */
-    
+
     switch (localeName[0]) {
         case 'a':
             if (c == 'a' || c == 'm') region = "ET";
             else if (c == 'f') region = "ZA";
             else if (c == 'n') region = "ES";
             else if (c == 'r') region = "AE";
             else if (c == 'z') region = "AZ";
             break;
         case 'b':
             if (c == 'e') region = "BY";
@@ skipping 140 matching lines @@
  * Returns the transformed string or NULL on error
  */
 xsltLocaleChar *
 xsltStrxfrm(xsltLocale locale, const xmlChar *string)
 {
 #ifdef XSLT_LOCALE_NONE
     return(NULL);
 #else
     size_t xstrlen, r;
     xsltLocaleChar *xstr;
-    
+
 #ifdef XSLT_LOCALE_XLOCALE
     xstrlen = strxfrm_l(NULL, (const char *)string, 0, locale) + 1;
     xstr = (xsltLocaleChar *) xmlMalloc(xstrlen);
     if (xstr == NULL) {
         xsltTransformError(NULL, NULL, NULL,
             "xsltStrxfrm : out of memory error\n");
         return(NULL);
     }
 
     r = strxfrm_l((char *)xstr, (const char *)string, xstrlen, locale);
@@ skipping 127 matching lines @@
 
         len = xsltLocaleListSize * sizeof(xsltRFC1766Info);
         xsltLocaleList = xmlMalloc(len);
         memset(xsltLocaleList, 0, len);
         EnumSystemLocalesA(xsltIterateSupportedLocales, LCID_SUPPORTED);
     }
     xmlRMutexUnlock(xsltLocaleMutex);
 }
 
 #endif /*def XSLT_LOCALE_WINAPI*/