From 73376b24cfe7cfe27b7b4b9abbe46ff441189b2a Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 29 Jun 2023 16:14:45 -0600
Subject: [PATCH] [subset/cff1] More error handling

---
 src/hb-subset-cff1.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
index fcd7ba421..e80d18d09 100644
--- a/src/hb-subset-cff1.cc
+++ b/src/hb-subset-cff1.cc
@@ -740,8 +740,9 @@ struct cff1_subset_plan
       ;
     }
 
-    return ((subset_charstrings.length == plan->num_output_glyphs ())
-	   && (fontdicts_mod.length == subset_fdcount));
+    return !plan->in_error () &&
+	   (subset_charstrings.length == plan->num_output_glyphs ()) &&
+	   (fontdicts_mod.length == subset_fdcount);
   }
 
   cff1_top_dict_values_mod_t	topdict_mod;