commit c62d6f418d87451b473beb373c372841e7d838ea
author Seigo Nonaka <nona@google.com> Wed Mar 01 19:52:57 2023 +0900
committer Seigo Nonaka <nona@google.com> Wed Mar 08 01:48:57 2023 +0000
tree c524df7802c691cf635a86a8fa7cde916f98dc87
parent c2f1e255ed98f615df997d8745deb79fedd57e25

Third attempt of updating HarfBuzz to 6.0.0

This reverts commit a0893709b560fac5555dac644d426255afc72393.

Bug: 266853145
Test: N/A
Change-Id: If649656e801a5195d189d550b478bcd8f27b3b05

src/hb-common.cc

diff --git a/src/hb-common.cc b/src/hb-common.cc
index bbb6cd5..e9f9cfe 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -285,7 +285,7 @@
     lang = (hb_language_t) hb_malloc(len);
     if (likely (lang))
     {
-      memcpy((unsigned char *) lang, s, len);
+      hb_memcpy((unsigned char *) lang, s, len);
       for (unsigned char *p = (unsigned char *) lang; *p; p++)
 	*p = canon_map[*p];
     }
@@ -379,7 +379,7 @@
     /* NUL-terminate it. */
     char strbuf[64];
     len = hb_min (len, (int) sizeof (strbuf) - 1);
-    memcpy (strbuf, str, len);
+    hb_memcpy (strbuf, str, len);
     strbuf[len] = '\0';
     item = lang_find_or_insert (strbuf);
   }
@@ -976,7 +976,7 @@
   }
 
   if (feature)
-    memset (feature, 0, sizeof (*feature));
+    hb_memset (feature, 0, sizeof (*feature));
   return false;
 }
 
@@ -1025,7 +1025,7 @@
   }
   assert (len < ARRAY_LENGTH (s));
   len = hb_min (len, size - 1);
-  memcpy (buf, s, len);
+  hb_memcpy (buf, s, len);
   buf[len] = '\0';
 }
 
@@ -1088,7 +1088,7 @@
   }
 
   if (variation)
-    memset (variation, 0, sizeof (*variation));
+    hb_memset (variation, 0, sizeof (*variation));
   return false;
 }
 
@@ -1136,7 +1136,7 @@
 /**
  * hb_variation_to_string:
  * @variation: an #hb_variation_t to convert
- * @buf: (array length=size) (out): output string
+ * @buf: (array length=size) (out caller-allocates): output string
  * @size: the allocated size of @buf
  *
  * Converts an #hb_variation_t into a `NULL`-terminated string in the format
@@ -1166,7 +1166,7 @@
 
   assert (len < ARRAY_LENGTH (s));
   len = hb_min (len, size - 1);
-  memcpy (buf, s, len);
+  hb_memcpy (buf, s, len);
   buf[len] = '\0';
 }