firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add error logging on invalid cmap - DO NOT MERGE

Browse Source 
am: ac3b9bc4ea

* commit 'ac3b9bc4ea57584b6b98307dc505567beaeedab1':
  Add error logging on invalid cmap - DO NOT MERGE
This commit is contained in:
Raph Levien
2016-02-17 23:43:26 +00:00
committed by android-build-merger
parent 8d10d3a0f9 ac3b9bc4ea
commit 055b8c8cda
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/flutter/libs/minikin/CmapCoverage.cpp
View File

@@ -19,6 +19,9 @@
#define LOG_TAG "Minikin"
#include <cutils/log.h>
#define LOG_TAG "Minikin"
#include <cutils/log.h>
#include <vector>
using std::vector;
@@ -67,6 +70,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 +117,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 +126,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