diff --git a/src/hb-aat-layout-common.hh b/src/hb-aat-layout-common.hh index 9015371a8..23cbb0384 100644 --- a/src/hb-aat-layout-common.hh +++ b/src/hb-aat-layout-common.hh @@ -166,6 +166,19 @@ struct hb_aat_apply_context_t : buffer_is_reversed = !buffer_is_reversed; } + /* Applying a subtable walks the whole buffer. The font controls the + * number of subtables, so charge each pass to the buffer's work budget. */ + HB_NODISCARD bool charge_buffer_pass () + { + buffer->max_ops -= buffer->len; + if (unlikely (buffer->max_ops < 0)) + { + buffer->successful = false; + return false; + } + return true; + } + void setup_buffer_glyph_set () { using_buffer_glyph_set = buffer->len >= 4 && buffer_glyph_set; diff --git a/src/hb-aat-layout-kerx-table.hh b/src/hb-aat-layout-kerx-table.hh index 7887cba35..f8e2987e7 100644 --- a/src/hb-aat-layout-kerx-table.hh +++ b/src/hb-aat-layout-kerx-table.hh @@ -1087,6 +1087,9 @@ struct KerxTable reverse = bool (st->u.header.coverage & st->u.header.Backwards) != HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction); + if (unlikely (!c->charge_buffer_pass ())) + break; + if (!c->buffer->message (c->font, "start subtable %u", c->lookup_index)) goto skip; @@ -1118,6 +1121,8 @@ struct KerxTable (void) c->buffer->message (c->font, "end subtable %u", c->lookup_index); + if (unlikely (!c->buffer->successful)) break; + skip: st = &StructAfter (*st); c->set_lookup_index (c->lookup_index + 1); diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index 7832eb873..a85ad6d4d 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -1238,6 +1238,9 @@ struct Chain bool (coverage & ChainSubtable::Backwards) != HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction); + if (unlikely (!c->charge_buffer_pass ())) + break; + if (!c->buffer->message (c->font, "start chainsubtable %u", c->lookup_index)) goto skip;