Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2011-05-18 12:50:34 -07:00
committed by Android (Google) Code Review
parent fb03c4fafe 78b868ff42
commit 41701ac5f6
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/jni/android/graphics/TextLayoutCache.cpp
View File

@@ -547,6 +547,25 @@ void TextLayoutCacheValue::computeRunValuesWithHarfbuzz(SkPaint* paint, const UC
LOGD(" -- isDevKernText=%d", paint->isDevKernText());
#endif
if (shaperItem.advances == NULL || shaperItem.num_glyphs == 0) {
#if DEBUG_GLYPHS
LOGD("HARFBUZZ -- advances array is empty or num_glypth = 0");
#endif
for (size_t i = 0; i < count; i++) {
outAdvances[i] = 0;
}
*outTotalAdvance = 0;
if (outGlyphs) {
*outGlyphsCount = 0;
*outGlyphs = new jchar[0];
}
// Cleaning
deleteGlyphArrays(&shaperItem);
HB_FreeFace(shaperItem.face);
return;
}
// Get Advances and their total
jfloat totalAdvance = outAdvances[0] = HBFixedToFloat(shaperItem.advances[shaperItem.log_clusters[0]]);
for (size_t i = 1; i < count; i++) {