diff options
author | Raph Levien <raph@google.com> | 2016-02-11 11:17:44 -0800 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2016-02-26 16:56:13 -0800 |
commit | 75265b340a24a883c2be387a1636b1ab24582a40 (patch) | |
tree | b442d875c9562a0a39e2ed56b22c4e65eb75ac46 /libs/minikin | |
parent | 013771f6e806f9dc32ec4318dd4e1ddd79be0878 (diff) | |
download | android_frameworks_minikin-75265b340a24a883c2be387a1636b1ab24582a40.tar.gz android_frameworks_minikin-75265b340a24a883c2be387a1636b1ab24582a40.tar.bz2 android_frameworks_minikin-75265b340a24a883c2be387a1636b1ab24582a40.zip |
Add error logging on invalid cmap
This patch logs instances of fonts with invalid cmap tables.
Bug: 25645298
Bug: 26413177
Change-Id: I183985e9784a97a2b4307a22e036382b1fc90e5e
Diffstat (limited to 'libs/minikin')
-rw-r--r-- | libs/minikin/CmapCoverage.cpp | 3 |
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 |