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

Fix crash in TextDropShadowCache

Browse Source 
The lengths used to copy/read arrays were completely wrong.

Change-Id: If21f23a73cce59bbd32975760e6d728eeeb9e40d
This commit is contained in:
Romain Guy
2012-11-30 15:29:15 -08:00
parent db69db1510
commit 69fcbccf47
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/hwui/TextDropShadowCache.cpp
View File

@@ -30,7 +30,7 @@ namespace uirenderer {
///////////////////////////////////////////////////////////////////////////////
hash_t ShadowText::hash() const {
uint32_t charCount = len * sizeof(char16_t);
uint32_t charCount = len / sizeof(char16_t);
uint32_t hash = JenkinsHashMix(0, len);
hash = JenkinsHashMix(hash, android::hash_type(radius));
hash = JenkinsHashMix(hash, android::hash_type(textSize));
@@ -38,9 +38,13 @@ hash_t ShadowText::hash() const {
hash = JenkinsHashMix(hash, flags);
hash = JenkinsHashMix(hash, android::hash_type(italicStyle));
hash = JenkinsHashMix(hash, android::hash_type(scaleX));
hash = JenkinsHashMixShorts(hash, text, charCount);
for (uint32_t i = 0; i < charCount * 2; i++) {
hash = JenkinsHashMix(hash, android::hash_type(positions[i]));
if (text) {
hash = JenkinsHashMixShorts(hash, text, charCount);
}
if (positions) {
for (uint32_t i = 0; i < charCount * 2; i++) {
hash = JenkinsHashMix(hash, android::hash_type(positions[i]));
}
}
return JenkinsHashWhiten(hash);
}

6
libs/hwui/TextDropShadowCache.h
View File

@@ -35,6 +35,7 @@ struct ShadowText {
flags(0), italicStyle(0.0f), scaleX(0), text(NULL), positions(NULL) {
}
// len is the number of bytes in text
ShadowText(SkPaint* paint, float radius, uint32_t len, const char* srcText,
const float* positions):
len(len), radius(radius), positions(positions) {
@@ -69,11 +70,12 @@ struct ShadowText {
}
void copyTextLocally() {
str.setTo((const char16_t*) text, len * sizeof(char16_t));
uint32_t charCount = len / sizeof(char16_t);
str.setTo((const char16_t*) text, charCount);
text = str.string();
if (positions != NULL) {
positionsCopy.clear();
positionsCopy.appendArray(positions, len);
positionsCopy.appendArray(positions, charCount * 2);
positions = positionsCopy.array();
}
}