Skip to content

Commit b2a331e

Browse files
Fabrice Di MeglioAndroid (Google) Code Review
authored andcommitted
Merge "Fix bug #6248364 Tamil and Denavagari text crash in Google+"
2 parents 972ed58 + 43e4985 commit b2a331e

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

core/jni/android/graphics/TextLayoutCache.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,8 @@ TextLayoutShaper::TextLayoutShaper() : mShaperItemGlyphArraySize(0) {
341341
mHebrewBoldTypeface = NULL;
342342
mBengaliTypeface = NULL;
343343
mThaiTypeface = NULL;
344+
mDevanagariTypeface = NULL;
345+
mTamilTypeface = NULL;
344346

345347
mFontRec.klass = &harfbuzzSkiaClass;
346348
mFontRec.userData = 0;
@@ -383,6 +385,8 @@ TextLayoutShaper::~TextLayoutShaper() {
383385
SkSafeUnref(mHebrewBoldTypeface);
384386
SkSafeUnref(mBengaliTypeface);
385387
SkSafeUnref(mThaiTypeface);
388+
SkSafeUnref(mDevanagariTypeface);
389+
SkSafeUnref(mTamilTypeface);
386390
deleteShaperItemGlyphArrays();
387391
}
388392

0 commit comments

Comments
 (0)