From 506ffeb8e77a668fa305139582d215c32e46bb03 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 18 Jan 2012 16:07:53 -0500 Subject: [PATCH] Further mark skippy fixes from Jonathan Kew We should be in good shape now. --- src/hb-ot-layout-gsubgpos-private.hh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index 8dbfc168f..211f0f4cb 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -86,6 +86,7 @@ struct hb_apply_context_t inline bool next (unsigned int *property_out, unsigned int lookup_props) { + assert (num_items > 0); do { if (has_no_chance ()) @@ -119,11 +120,12 @@ struct hb_apply_context_t } inline bool has_no_chance (void) const { - return unlikely (num_items && num_items >= idx); + return unlikely (idx < num_items); } inline bool prev (unsigned int *property_out, unsigned int lookup_props) { + assert (num_items > 0); do { if (has_no_chance ())