summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-04-05 17:58:03 (GMT)
committerJessica Wagantall <jwagantall@cyngn.com>2016-04-05 17:58:03 (GMT)
commit4136afeb924c1033d896fceb983d97d2e1d44da0 (patch)
treefae80a6b83a3e585c514217d3ccd27b746f20e84
parent9afd6226a656bd21e6002b6283d3ddd37c1a60d5 (diff)
parentf10ea6d5cde38deefc7a32dbd7eaa30c5ec0b2a0 (diff)
downloadandroid_frameworks_minikin-stable/cm-13.0-ZNH0E.zip
android_frameworks_minikin-stable/cm-13.0-ZNH0E.tar.gz
android_frameworks_minikin-stable/cm-13.0-ZNH0E.tar.bz2
Merge tag 'android-6.0.1_r20' into HEADstable/cm-13.0-ZNH0E
Ticket: CYNGNOS-2213 Android 6.0.1 release 20 Change-Id: Ie770a74ace8cdf34323636397d75823f6add0c71
-rw-r--r--libs/minikin/CmapCoverage.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/minikin/CmapCoverage.cpp b/libs/minikin/CmapCoverage.cpp
index 9f3447e..a4503af 100644
--- a/libs/minikin/CmapCoverage.cpp
+++ b/libs/minikin/CmapCoverage.cpp
@@ -67,6 +67,7 @@ static bool getCoverageFormat4(vector<uint32_t>& coverage, const uint8_t* data,
uint32_t start = readU16(data, kHeaderSize + 2 * (segCount + i));
if (end < start) {
// invalid segment range: size must be positive
+ android_errorWriteLog(0x534e4554, "26413177");
return false;
}
uint32_t rangeOffset = readU16(data, kHeaderSize + 2 * (3 * segCount + i));
@@ -113,6 +114,7 @@ static bool getCoverageFormat12(vector<uint32_t>& coverage, const uint8_t* data,
}
uint32_t nGroups = readU32(data, kNGroupsOffset);
if (nGroups >= kMaxNGroups || kFirstGroupOffset + nGroups * kGroupSize > size) {
+ android_errorWriteLog(0x534e4554, "25645298");
return false;
}
for (uint32_t i = 0; i < nGroups; i++) {
@@ -121,6 +123,7 @@ static bool getCoverageFormat12(vector<uint32_t>& coverage, const uint8_t* data,
uint32_t end = readU32(data, groupOffset + kEndCharCodeOffset);
if (end < start) {
// invalid group range: size must be positive
+ android_errorWriteLog(0x534e4554, "26413177");
return false;
}
addRange(coverage, start, end + 1); // file is inclusive, vector is exclusive