diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 1026d6824b552e75a12057bfc0ea4375578368f0..f8a6b0c46814491a6406689c4a1b3440941ab9ae 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -496,8 +496,9 @@ reference_table  (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data)
     return nullptr;
 
   error = FT_Load_Sfnt_Table (ft_face, tag, 0, buffer, &length);
-  if (error) {
-    free ((void*)buffer);
+  if (error)
+  {
+    free (buffer);
     return nullptr;
   }
 
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 70c9c63c61bd601f9e10e992d3e82d0c03546412..e40a0e94a3daab9b5a793866ef77a32ab45d5ea5 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -193,8 +193,9 @@ _hb_ot_shaper_shape_plan_data_create (hb_shape_plan_t    *shape_plan,
 
   if (plan->shaper->data_create) {
     plan->data = plan->shaper->data_create (plan);
-    if (unlikely (!plan->data)) {
-      free ((void*)plan);
+    if (unlikely (!plan->data))
+    {
+      free (plan);
       return nullptr;
     }
   }