commit 43e4985abfcb69db8fb39a95794eb34a2f142214
author Fabrice Di Meglio <fdimeglio@google.com> Wed Mar 28 16:05:36 2012 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Wed Mar 28 16:05:36 2012 -0700
tree be7f9bf969456512fcfe46622cdf98ad34090019
parent 31074a5d5d9fbdd5c138d658f26a8e22d9a70094

Fix bug #6248364 Tamil and Denavagari text crash in Google+

- fix initialization of variables

Change-Id: Ibda4e1e6f55f867385eaf9a4c7a754c16815bbf0

core/jni/android/graphics/TextLayoutCache.cpp

diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index efeba5c..a7abbfa 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -341,6 +341,8 @@
     mHebrewBoldTypeface = NULL;
     mBengaliTypeface = NULL;
     mThaiTypeface = NULL;
+    mDevanagariTypeface = NULL;
+    mTamilTypeface = NULL;
 
     mFontRec.klass = &harfbuzzSkiaClass;
     mFontRec.userData = 0;
@@ -383,6 +385,8 @@
     SkSafeUnref(mHebrewBoldTypeface);
     SkSafeUnref(mBengaliTypeface);
     SkSafeUnref(mThaiTypeface);
+    SkSafeUnref(mDevanagariTypeface);
+    SkSafeUnref(mTamilTypeface);
     deleteShaperItemGlyphArrays();
 }