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

[Behdad Esfahbod]

 src/harfbuzz-indic.cpp |    2 ++
 src/harfbuzz-myanmar.c |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 90138e5a4d15c44f05456f90083ecacdc3196c8e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Mar 27 15:03:15 2012 -0400

    Fix bad memory access in Myanmar shaper

diff --git a/src/harfbuzz-myanmar.c b/src/harfbuzz-myanmar.c
index 4b68e64..1a5ea3d 100644
--- a/src/harfbuzz-myanmar.c
+++ b/src/harfbuzz-myanmar.c
@@ -359,7 +359,8 @@ static HB_Bool myanmar_shape_syllable(HB_Bool openType, HB_ShaperItem *item, HB_
         if (kinzi >= 0 && i > base && (cc & Mymr_CF_AFTER_KINZI)) {
             reordered[len] = Mymr_C_NGA;
             reordered[len+1] = Mymr_C_VIRAMA;
-            properties[len-1] = AboveForm;
+	    if (len > 0)
+	      properties[len-1] = AboveForm;
             properties[len] = AboveForm;
             len += 2;
             kinzi = -1;
commit 3bebe289aace6daa84b3d6983cebf5c58ddfad78
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Mar 27 15:00:35 2012 -0400

    Fix problem with Indic shaper and control chars

diff --git a/src/harfbuzz-indic.cpp b/src/harfbuzz-indic.cpp
index ffe9573..b313543 100644
--- a/src/harfbuzz-indic.cpp
+++ b/src/harfbuzz-indic.cpp
@@ -1683,6 +1683,8 @@ static bool indic_shape_syllable(HB_Bool openType, HB_ShaperItem *item, bool inv
                 }
                 item->glyphs[j] = item->glyphs[i];
                 item->attributes[j] = item->attributes[i];
+                item->offsets[j] = item->offsets[i];
+                item->advances[j] = item->advances[i];
                 ++i;
                 ++j;
             }