summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2014-05-23 22:44:35 -0700
committerRaph Levien <raph@google.com>2014-05-23 22:44:35 -0700
commit72fe9422c869b7878240a23e4650d9d90edb1c2a (patch)
tree1bf37e445daedf0757a47d0b521eace08f6aa08c
parentb43357ad71782b4d1df03ee7e89b30705fcc6a93 (diff)
downloadandroid_frameworks_minikin-72fe9422c869b7878240a23e4650d9d90edb1c2a.tar.gz
android_frameworks_minikin-72fe9422c869b7878240a23e4650d9d90edb1c2a.tar.bz2
android_frameworks_minikin-72fe9422c869b7878240a23e4650d9d90edb1c2a.zip
Fix native crash in Latin-1 typefaces
This is a fix for bug 15171911 Timely crashes (native crash in libminikin) when I go to add a new alarm This patch fixes an off-by-one error that caused typefaces with only one page of Unicode coverage (ASCII or Latin-1) to have nPages = 0 instead of the correct value of 1 in the corresponding FontCollection. Change-Id: Id8be0c9e5713b8af22d863992921ee6382416a34
-rw-r--r--libs/minikin/FontCollection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/minikin/FontCollection.cpp b/libs/minikin/FontCollection.cpp
index cd7b19e..8919dc1 100644
--- a/libs/minikin/FontCollection.cpp
+++ b/libs/minikin/FontCollection.cpp
@@ -66,7 +66,7 @@ FontCollection::FontCollection(const vector<FontFamily*>& typefaces) :
mMaxChar = max(mMaxChar, instance->mCoverage->length());
lastChar.push_back(instance->mCoverage->nextSetBit(0));
}
- size_t nPages = mMaxChar >> kLogCharsPerPage;
+ size_t nPages = (mMaxChar + kPageMask) >> kLogCharsPerPage;
size_t offset = 0;
for (size_t i = 0; i < nPages; i++) {
Range dummy;