commit 77507a1d8d872d8cd4f62b807e933cd3e2cdb110
author Garret Rieger <grieger@google.com> Fri Dec 10 14:10:04 2021 -0800
committer Behdad Esfahbod <behdad@behdad.org> Fri Dec 10 15:13:49 2021 -0700
tree 4c7f0d76e1412b5c95d17d3003a1581152a2f20f
parent d67025705f0c4993cdd756bc47d942e14ceed0a1

[subset] Don't double count visit lookups in closure_lookups

Each recursed lookup was getting counted once in closure_lookups() and then again in hb_closure_lookups_context_t::recurse.

src/hb-ot-layout-gsubgpos.hh

diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index 46f5531..191d3be 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -214,7 +214,11 @@
       return;
 
     /* Return if new lookup was recursed to before. */
-    if (is_lookup_visited (lookup_index))
+    if (lookup_limit_exceeded ()
+        || visited_lookups->in_error ()
+        || visited_lookups->has (lookup_index))
+      // Don't increment lookup count here, that will be done in the call to closure_lookups()
+      // made by recurse_func.
       return;
 
     nesting_level_left--;