From: Behdad Esfahbod Date: Thu, 19 Jan 2012 02:28:34 +0000 (-0500) Subject: Fix more possible buffer overruns X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03408ce73d003ed4e58e3f8472f9445e72b86bee;p=platform%2Fupstream%2FlibHarfBuzzSharp.git Fix more possible buffer overruns I have this function, but can't clean up it to my satisfaction. --- diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index f1d03dc..13386c2 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -317,12 +317,14 @@ static inline bool apply_lookup (hb_apply_context_t *c, */ for (unsigned int i = 0; i < count; /* NOP */) { + if (unlikely (c->buffer->idx == end)) + return true; while (c->should_mark_skip_current_glyph ()) { - if (unlikely (c->buffer->idx == end)) - return true; /* No lookup applied for this index */ c->buffer->next_glyph (); + if (unlikely (c->buffer->idx == end)) + return true; } if (lookupCount && i == lookupRecord->sequenceIndex)