commit 2337f0d047f2561c13b29b70ad783bbf0d286654
author Behdad Esfahbod <behdad@behdad.org> Thu Jul 08 10:58:50 2021 -0600
committer Behdad Esfahbod <behdad@behdad.org> Thu Jul 08 10:54:09 2021 -0700
tree a94dd3c28d559c6481207777e20f36c08a4c8ca5
parent bb48bf52a4645abda6fe98cc5ee33beab69931a5

Internally use hb_malloc/.../hb_free instead of malloc/.../free

Redefining those stock names as macros was conflicting with gcc 10
headers.

Fixes https://github.com/harfbuzz/harfbuzz/issues/3044

src/hb-common.cc

diff --git a/src/hb-common.cc b/src/hb-common.cc
index ebc7e42..cbba1a7 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -261,7 +261,7 @@
   {
     /* We can't call strdup(), because we allow custom allocators. */
     size_t len = strlen(s) + 1;
-    lang = (hb_language_t) malloc(len);
+    lang = (hb_language_t) hb_malloc(len);
     if (likely (lang))
     {
       memcpy((unsigned char *) lang, s, len);
@@ -272,7 +272,7 @@
     return *this;
   }
 
-  void fini () { free ((void *) lang); }
+  void fini () { hb_free ((void *) lang); }
 };
 
 
@@ -292,7 +292,7 @@
   while (first_lang) {
     hb_language_item_t *next = first_lang->next;
     first_lang->fini ();
-    free (first_lang);
+    hb_free (first_lang);
     first_lang = next;
   }
 }
@@ -309,21 +309,21 @@
       return lang;
 
   /* Not found; allocate one. */
-  hb_language_item_t *lang = (hb_language_item_t *) calloc (1, sizeof (hb_language_item_t));
+  hb_language_item_t *lang = (hb_language_item_t *) hb_calloc (1, sizeof (hb_language_item_t));
   if (unlikely (!lang))
     return nullptr;
   lang->next = first_lang;
   *lang = key;
   if (unlikely (!lang->lang))
   {
-    free (lang);
+    hb_free (lang);
     return nullptr;
   }
 
   if (unlikely (!langs.cmpexch (first_lang, lang)))
   {
     lang->fini ();
-    free (lang);
+    hb_free (lang);
     goto retry;
   }