From f772071f3e7241367d56c5a6f82d394bea2b829e Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sun, 7 May 2023 13:42:00 -0600
Subject: [PATCH] [subset-plan] Another error check

---
 src/hb-subset-accelerator.hh | 2 ++
 src/hb-subset-plan.cc        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/hb-subset-accelerator.hh b/src/hb-subset-accelerator.hh
index e523c2582..bb7c62d06 100644
--- a/src/hb-subset-accelerator.hh
+++ b/src/hb-subset-accelerator.hh
@@ -58,6 +58,8 @@ struct hb_subset_accelerator_t
     hb_subset_accelerator_t* accel =
         (hb_subset_accelerator_t*) hb_calloc (1, sizeof(hb_subset_accelerator_t));
 
+    if (unlikely (!accel)) return accel;
+
     new (accel) hb_subset_accelerator_t (unicode_to_gid_,
 					 gid_to_unicodes_,
 					 unicodes_,
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 013f9ccc4..1cbff1e0c 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -1052,6 +1052,8 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
 				       gid_to_unicodes,
                                        unicodes,
 				       has_seac);
+
+    check_success (inprogress_accelerator);
   }
 
 #define HB_SUBSET_PLAN_MEMBER(Type, Name) check_success (!Name.in_error ());