From ff681447247d64db5faff01c5a70bb0f15089792 Mon Sep 17 00:00:00 2001
From: Wang Guan <momocraft@gmail.com>
Date: Thu, 26 Oct 2017 00:54:55 +0900
Subject: [PATCH] use default allocator in place of strdup/free

---
 src/language.c | 15 ++++++++++-----
 src/tmbstr.c   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/language.c b/src/language.c
index 6ef97f5..7d7f5bd 100644
--- a/src/language.c
+++ b/src/language.c
@@ -299,6 +299,7 @@ ctmbstr TY_(tidyLocalizedString)( uint messageType )
  **  Determines the current locale without affecting the C locale.
  **  Tidy has always used the default C locale, and at this point
  **  in its development we're not going to tamper with that.
+ **  @note this routine uses default allocator, see tidySetMallocCall.
  **  @param  result The buffer to use to return the string.
  **          Returns NULL on failure.
  **  @return The same buffer for convenience.
@@ -306,6 +307,7 @@ ctmbstr TY_(tidyLocalizedString)( uint messageType )
 tmbstr TY_(tidySystemLocale)(tmbstr result)
 {
     ctmbstr temp;
+    TidyAllocator* allocator = &TY_(g_default_allocator);
     
     /* This should set the OS locale. */
     setlocale( LC_ALL, "" );
@@ -315,7 +317,7 @@ tmbstr TY_(tidySystemLocale)(tmbstr result)
     
     /* Make a new copy of the string, because temp
      always points to the current locale. */
-    if (( result = malloc( strlen( temp ) + 1 ) ))
+    if (( result = TidyAlloc( allocator, strlen( temp ) + 1 ) ))
         strcpy(result, temp);
     
     /* This should restore the C locale. */
@@ -329,13 +331,16 @@ tmbstr TY_(tidySystemLocale)(tmbstr result)
  *  Retrieves the POSIX name for a string. Result is a static char so please
  *  don't try to free it. If the name looks like a cc_ll identifier, we will
  *  return it if there's no other match.
+ *  @note this routine uses default allocator, see tidySetMallocCall.
  */
 tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
 {
     uint i;
     uint len;
     static char result[6] = "xx_yy";
-    tmbstr search = strdup(locale);
+    TidyAllocator * allocator = &TY_(g_default_allocator);
+
+    tmbstr search = TY_(tmbstrdup)( allocator, locale );
     search = TY_(tmbstrtolower)(search);
     
     /* See if our string matches a Windows name. */
@@ -343,8 +348,8 @@ tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
     {
         if ( strcmp( localeMappings[i].winName, search ) == 0 )
         {
-            free(search);
-            search = strdup(localeMappings[i].POSIXName);
+            TidyFree( allocator, search );
+            search = TY_(tmbstrdup)( allocator, localeMappings[i].POSIXName );
             break;
         }
     }
@@ -376,7 +381,7 @@ tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
         }
     }
     
-    free( search );
+    TidyFree( allocator, search );
     return result;
 }
 
diff --git a/src/tmbstr.c b/src/tmbstr.c
index cb49266..0cfe5f2 100644
--- a/src/tmbstr.c
+++ b/src/tmbstr.c
@@ -102,7 +102,7 @@ uint TY_(tmbstrlen)( ctmbstr str )
 }
 
 /*
- MS C 4.2 doesn't include strcasecmp.
+ MS C 4.2 (and ANSI C) doesn't include strcasecmp.
  Note that tolower and toupper won't
  work on chars > 127.