Add sanitize() logic for fast-paths
diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index b826264..ad403d5 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -1308,12 +1308,18 @@
Extension = 9
};
+ inline bool can_use_fast_path (unsigned int lookup_type) const
+ {
+ /* Fast path, for those that have coverage in the same place. */
+ return likely (lookup_type < Context) ||
+ (hb_in_range<unsigned int> (lookup_type, Context, ChainContext) &&
+ hb_in_range<unsigned int> (u.header.sub_format, 1, 2));
+ }
+
inline bool apply (hb_apply_context_t *c, unsigned int lookup_type) const
{
TRACE_APPLY ();
- if (likely (lookup_type < Context) ||
- (hb_in_range<unsigned int> (lookup_type, Context, ChainContext) &&
- hb_in_range<unsigned int> (u.header.sub_format, 1, 2)))
+ if (can_use_fast_path (lookup_type))
{
/* Fast path, for most that have coverage in the same place. */
hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
@@ -1336,6 +1342,9 @@
inline bool sanitize (hb_sanitize_context_t *c, unsigned int lookup_type) {
TRACE_SANITIZE ();
+ if (!u.header.sub_format.sanitize (c) ||
+ (can_use_fast_path (lookup_type)) && !u.header.coverage.sanitize (c, this))
+ return TRACE_RETURN (false);
switch (lookup_type) {
case Single: return TRACE_RETURN (u.single.sanitize (c));
case Pair: return TRACE_RETURN (u.pair.sanitize (c));
