Replace a few memset/memcpy's with hb_ equivalents

src/OT/glyf/VarCompositeGlyph.hh

@@ -214,7 +214,7 @@ struct VarCompositeGlyphRecord
     points.alloc (points.length + num_points + 4); // For phantom points
     if (unlikely (!points.resize (points.length + num_points, false))) return false;
     contour_point_t *rec_points = points.arrayZ + (points.length - num_points);
-    memset (rec_points, 0, num_points * sizeof (rec_points[0]));
+    hb_memset (rec_points, 0, num_points * sizeof (rec_points[0]));
 
     unsigned fl = flags;
 

src/OT/name/name.hh

@@ -359,7 +359,7 @@ struct name
       record.nameID = ids.name_id;
       record.length = 0; // handled in NameRecord copy()
       record.offset = 0;
-      memcpy (name_records, &record, NameRecord::static_size);
+      hb_memcpy (name_records, &record, NameRecord::static_size);
       name_records++;
     }
 #endif

src/hb-cairo-utils.cc

@@ -80,7 +80,7 @@ hb_cairo_read_blob (void *closure,
   if (r->offset + length > size)
     return CAIRO_STATUS_READ_ERROR;
 
-  memcpy (data, d + r->offset, length);
+  hb_memcpy (data, d + r->offset, length);
   r->offset += length;
 
   return CAIRO_STATUS_SUCCESS;

src/hb-cairo.cc

@@ -956,7 +956,7 @@ hb_cairo_glyphs_from_buffer (hb_buffer_t *buffer,
 
   if (clusters && *num_clusters && utf8)
   {
-    memset ((void *) *clusters, 0, *num_clusters * sizeof ((*clusters)[0]));
+    hb_memset ((void *) *clusters, 0, *num_clusters * sizeof ((*clusters)[0]));
     hb_bool_t backward = HB_DIRECTION_IS_BACKWARD (hb_buffer_get_direction (buffer));
     *cluster_flags = backward ? CAIRO_TEXT_CLUSTER_FLAG_BACKWARD : (cairo_text_cluster_flags_t) 0;
     unsigned int cluster = 0;

src/hb-map.hh

@@ -184,7 +184,7 @@ struct hb_hashmap_t
       for (auto &_ : hb_iter (new_items, new_size))
 	new (&_) item_t ();
     else
-      memset (new_items, 0, (size_t) new_size * sizeof (item_t));
+      hb_memset (new_items, 0, (size_t) new_size * sizeof (item_t));
 
     unsigned int old_size = size ();
     item_t *old_items = items;

src/hb-shape.cc

@@ -220,7 +220,7 @@ reset_buffer (hb_buffer_t *buffer,
   assert (buffer->ensure (text.length));
   buffer->have_positions = false;
   buffer->len = text.length;
-  memcpy (buffer->info, text.arrayZ, text.length * sizeof (buffer->info[0]));
+  hb_memcpy (buffer->info, text.arrayZ, text.length * sizeof (buffer->info[0]));
   hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_UNICODE);
 }
 

src/hb-vector.hh

@@ -306,7 +306,7 @@ struct hb_vector_t
   void
   grow_vector (unsigned size, hb_priority<0>)
   {
-    memset (arrayZ + length, 0, (size - length) * sizeof (*arrayZ));
+    hb_memset (arrayZ + length, 0, (size - length) * sizeof (*arrayZ));
     length = size;
   }
   template <typename T = Type,
@@ -324,7 +324,7 @@ struct hb_vector_t
   void
   grow_vector (unsigned size, hb_priority<1>)
   {
-    memset (arrayZ + length, 0, (size - length) * sizeof (*arrayZ));
+    hb_memset (arrayZ + length, 0, (size - length) * sizeof (*arrayZ));
     length = size;
   }
 

src/hb-wasm-api-buffer.hh

@@ -64,13 +64,13 @@ HB_WASM_API (bool_t, buffer_contents_realloc) (HB_WASM_EXEC_ENV
   unsigned old_bytes = contents->length * sizeof (glyph_info_t);
   if (likely (new_inforef))
   {
-    memcpy (new_info, info, old_bytes);
+    hb_memcpy (new_info, info, old_bytes);
     module_free (contents->info);
     contents->info = new_inforef;
   }
   if (likely (new_posref))
   {
-    memcpy (new_pos, pos, old_bytes);
+    hb_memcpy (new_pos, pos, old_bytes);
     module_free (contents->pos);
     contents->pos = new_posref;
   }
@@ -127,8 +127,8 @@ HB_WASM_API (bool_t, buffer_copy_contents) (HB_WASM_EXEC_ENV
     }
 
     unsigned bytes = length * sizeof (hb_glyph_info_t);
-    memcpy (info, buffer->info, bytes);
-    memcpy (pos, buffer->pos, bytes);
+    hb_memcpy (info, buffer->info, bytes);
+    hb_memcpy (pos, buffer->pos, bytes);
 
     return true;
   }
@@ -173,8 +173,8 @@ HB_WASM_API (bool_t, buffer_set_contents) (HB_WASM_EXEC_ENV
   if (!buffer->have_positions)
     buffer->clear_positions (); /* This is wasteful. */
 
-  memcpy (buffer->info, info, bytes);
-  memcpy (buffer->pos, pos, bytes);
+  hb_memcpy (buffer->info, info, bytes);
+  hb_memcpy (buffer->pos, pos, bytes);
   buffer->len = length;
 
   return true;

src/hb-wasm-api-face.hh

@@ -74,7 +74,7 @@ HB_WASM_API (bool_t, face_copy_table) (HB_WASM_EXEC_ENV
       return false;
     }
 
-    memcpy (data, hb_data, length);
+    hb_memcpy (data, hb_data, length);
 
     return true;
   }

src/hb-wasm-api-font.hh

@@ -160,8 +160,8 @@ HB_WASM_API (bool_t, font_copy_glyph_outline) (HB_WASM_EXEC_ENV
       return false;
     }
 
-    memcpy (points, hb_outline.points.arrayZ, hb_outline.points.get_size ());
-    memcpy (contours, hb_outline.contours.arrayZ, hb_outline.contours.get_size ());
+    hb_memcpy (points, hb_outline.points.arrayZ, hb_outline.points.get_size ());
+    hb_memcpy (contours, hb_outline.contours.arrayZ, hb_outline.contours.get_size ());
 
     return true;
   }
@@ -220,7 +220,7 @@ HB_WASM_API (bool_t, font_copy_coords) (HB_WASM_EXEC_ENV
     	return false;
     }
 		unsigned bytes = our_length * sizeof (int);
-    memcpy (their_coords, our_coords, bytes);
+    hb_memcpy (their_coords, our_coords, bytes);
 
     return true;
   }

src/hb-wasm-shape.cc

@@ -136,7 +136,7 @@ _hb_wasm_init ()
     return true;
 
   RuntimeInitArgs init_args;
-  memset (&init_args, 0, sizeof (RuntimeInitArgs));
+  hb_memset (&init_args, 0, sizeof (RuntimeInitArgs));
 
   init_args.mem_alloc_type = Alloc_With_Allocator;
   init_args.mem_alloc_option.allocator.malloc_func = (void *) hb_malloc;