commit 663ecc01d8cd32c3fcb8421ee157815ecab413db
author Garret Rieger <grieger@google.com> Mon Mar 13 22:12:59 2023 +0000
committer Behdad Esfahbod <behdad@behdad.org> Mon Mar 13 16:32:59 2023 -0600
tree ef77fdccdfcb125b118bfa0ee4132624c28a3bab
parent 3d05b96181b259593047f592df4df33a3658e472

[subset] don't free glyphs by range.

The iterator in this loop is a map iterator so glyphs are not necessarily traveresed in order.

src/OT/glyf/glyf.hh

diff --git a/src/OT/glyf/glyf.hh b/src/OT/glyf/glyf.hh
index 6e9f420..7d2522e 100644
--- a/src/OT/glyf/glyf.hh
+++ b/src/OT/glyf/glyf.hh
@@ -131,7 +131,7 @@
 
     bool result = glyf_prime->serialize (c->serializer, glyphs.writer (), use_short_loca, c->plan);
     if (c->plan->normalized_coords && !c->plan->pinned_at_default)
-      _free_compiled_subset_glyphs (glyphs, glyphs.length - 1);
+      _free_compiled_subset_glyphs (glyphs);
 
     if (!result) return false;
 
@@ -150,9 +150,9 @@
   hb_font_t *
   _create_font_for_instancing (const hb_subset_plan_t *plan) const;
 
-  void _free_compiled_subset_glyphs (hb_vector_t<glyf_impl::SubsetGlyph> &glyphs, unsigned index) const
+  void _free_compiled_subset_glyphs (hb_vector_t<glyf_impl::SubsetGlyph> &glyphs) const
   {
-    for (unsigned i = 0; i <= index && i < glyphs.length; i++)
+    for (unsigned i = 0; i < glyphs.length; i++)
       glyphs[i].free_compiled_bytes ();
   }
 
@@ -452,7 +452,7 @@
       {
         // when pinned at default, only bounds are updated, thus no need to free
         if (!plan->pinned_at_default)
-          _free_compiled_subset_glyphs (glyphs, new_gid);
+          _free_compiled_subset_glyphs (glyphs);
         return false;
       }
     }