[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-ot-layout-gsubgpos-private.hh |    1 -
 src/hb-ot-shape-complex-indic.cc     |    7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e7ce50d9eb6e3678f731b10dfeb308ffc478af8d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 16 12:30:39 2014 -0400

    [indic] Fix access past end of array

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index 02087a0..5bb1f33 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -1372,9 +1372,10 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
   if (base == end && start < base &&
       is_one_of (info[base - 1], FLAG (OT_ZWJ)))
     base--;
-  while (start < base &&
-	 is_one_of (info[base], (FLAG (OT_N) | HALANT_OR_COENG_FLAGS)))
-    base--;
+  if (base < end)
+    while (start < base &&
+	   is_one_of (info[base], (FLAG (OT_N) | HALANT_OR_COENG_FLAGS)))
+      base--;
 
 
   /*   o Reorder matras:
commit 73e23b0acfd2948d500321769035c56c9e072d77
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 15 18:43:49 2014 -0400

    Whitespace

diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 0416589..470c353 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -487,7 +487,6 @@ struct hb_apply_context_t
 	const hb_glyph_info_t &info = c->buffer->out_info[idx];
 
 	matcher_t::may_skip_t skip = matcher.may_skip (c, info);
-
 	if (unlikely (skip == matcher_t::SKIP_YES))
 	  continue;