commit 9ed5f04a7092c76744076ba65673b250aee22dcd
author Behdad Esfahbod <behdad@behdad.org> Mon Mar 29 18:14:30 2021 -0600
committer Behdad Esfahbod <behdad@behdad.org> Mon Mar 29 18:14:30 2021 -0600
tree 0743436fe8ddf7bb3213c4564a71610da6f65e11
parent a8f9f85a919543ce79b5a7d5df90c132830ae772

[subset] Simplify recent out-of-memory fixes

By checking return status of map->set().

src/hb-ot-layout-gsubgpos.hh

diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index 1e9f2f4..f820976 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -108,12 +108,12 @@
 
       if (!done_lookups_glyph_set->get (lookup_index))
       {
-        hb_set_t* empty_set = hb_set_create ();
-        done_lookups_glyph_set->set (lookup_index, empty_set);
-        if (!done_lookups_glyph_set->get (lookup_index)) {
-          hb_set_destroy (empty_set);
-          return true;
-        }
+	hb_set_t* empty_set = hb_set_create ();
+	if (unlikely (!done_lookups_glyph_set->set (lookup_index, empty_set)))
+	{
+	  hb_set_destroy (empty_set);
+	  return true;
+	}
       }
 
       done_lookups_glyph_set->get (lookup_index)->clear ();