[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-shape.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f2a1b411b1d48c3dfac0df8e78c848d9aa3bb047
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jun 3 11:37:51 2010 -0400

    Followup fix for variation-selectors
    
    Patch from Jonathan Kew

diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 77724ce..027f725 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -484,7 +484,8 @@ hb_map_glyphs (hb_font_t    *font,
       buffer->add_output_glyph (hb_font_get_glyph (font, face, buffer->info[buffer->i].codepoint, 0));
     }
   }
-  buffer->add_output_glyph (hb_font_get_glyph (font, face, buffer->info[buffer->i].codepoint, 0));
+  if (likely (buffer->i < buffer->len))
+    buffer->add_output_glyph (hb_font_get_glyph (font, face, buffer->info[buffer->i].codepoint, 0));
   buffer->swap ();
 }