zumun/woff2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #81 from rsheeter/master

Browse Source 
Check glyf/loca pairing for TTC and check glyf/loca matching transform status
This commit is contained in:
rsheeter
2017-07-31 09:22:05 -07:00
committed by GitHub
parent 7dfff0003d 2e09253456
commit 36e6555b92
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/woff2_dec.cc
+28 -8
View File
@@ -876,11 +876,26 @@ bool ReconstructFont(uint8_t* transformed_buf,
std::vector<Table*> tables = Tables(hdr, font_index); std::vector<Table*> tables = Tables(hdr, font_index);
// 'glyf' without 'loca' doesn't make sense // 'glyf' without 'loca' doesn't make sense
if (PREDICT_FALSE(static_cast<bool>(FindTable(&tables, kGlyfTableTag)) != const Table* glyf_table = FindTable(&tables, kGlyfTableTag);
static_cast<bool>(FindTable(&tables, kLocaTableTag)))) { const Table* loca_table = FindTable(&tables, kLocaTableTag);
if (PREDICT_FALSE(static_cast<bool>(glyf_table) !=
static_cast<bool>(loca_table))) {
#ifdef FONT_COMPRESSION_BIN
fprintf(stderr, "Cannot have just one of glyf/loca\n");
#endif
return FONT_COMPRESSION_FAILURE(); return FONT_COMPRESSION_FAILURE();
} }
if (glyf_table != NULL) {
if (PREDICT_FALSE((glyf_table->flags & kWoff2FlagsTransform)
!= (loca_table->flags & kWoff2FlagsTransform))) {
#ifdef FONT_COMPRESSION_BIN
fprintf(stderr, "Cannot transform just one of glyf/loca\n");
#endif
return FONT_COMPRESSION_FAILURE();
}
}
uint32_t font_checksum = metadata->header_checksum; uint32_t font_checksum = metadata->header_checksum;
if (hdr->header_version) { if (hdr->header_version) {
font_checksum = hdr->ttc_fonts[font_index].header_checksum; font_checksum = hdr->ttc_fonts[font_index].header_checksum;
@@ -1100,8 +1115,9 @@ bool ReadWOFF2Header(const uint8_t* data, size_t length, WOFF2Header* hdr) {
ttc_font.table_indices.resize(num_tables); ttc_font.table_indices.resize(num_tables);
const Table* glyf_table = NULL;
const Table* loca_table = NULL; unsigned int glyf_idx = 0;
unsigned int loca_idx = 0;
for (uint32_t j = 0; j < num_tables; j++) { for (uint32_t j = 0; j < num_tables; j++) {
unsigned int table_idx; unsigned int table_idx;
@@ -1113,22 +1129,26 @@ bool ReadWOFF2Header(const uint8_t* data, size_t length, WOFF2Header* hdr) {
const Table& table = hdr->tables[table_idx]; const Table& table = hdr->tables[table_idx];
if (table.tag == kLocaTableTag) { if (table.tag == kLocaTableTag) {
loca_table = &table; loca_idx = table_idx;
} }
if (table.tag == kGlyfTableTag) { if (table.tag == kGlyfTableTag) {
glyf_table = &table; glyf_idx = table_idx;
} }
} }
if (PREDICT_FALSE((glyf_table == NULL) != (loca_table == NULL))) { // if we have both glyf and loca make sure they are consecutive
// if we have just one we'll reject the font elsewhere
if (glyf_idx > 0 || loca_idx > 0) {
if (PREDICT_FALSE(glyf_idx > loca_idx || loca_idx - glyf_idx != 1)) {
#ifdef FONT_COMPRESSION_BIN #ifdef FONT_COMPRESSION_BIN
fprintf(stderr, "Cannot have just one of glyf/loca\n"); fprintf(stderr, "TTC font %d has non-consecutive glyf/loca\n", i);
#endif #endif
return FONT_COMPRESSION_FAILURE(); return FONT_COMPRESSION_FAILURE();
} }
} }
} }
}
const uint64_t first_table_offset = ComputeOffsetToFirstTable(*hdr); const uint64_t first_table_offset = ComputeOffsetToFirstTable(*hdr);
src/woff2_decompress.cc
+1
View File
@@ -32,6 +32,7 @@ int main(int argc, char **argv) {
string filename(argv[1]); string filename(argv[1]);
string outfilename = filename.substr(0, filename.find_last_of(".")) + ".ttf"; string outfilename = filename.substr(0, filename.find_last_of(".")) + ".ttf";
// Note: update woff2_dec_fuzzer_new_entry.cc if this pattern changes.
string input = woff2::GetFileContent(filename); string input = woff2::GetFileContent(filename);
const uint8_t* raw_input = reinterpret_cast<const uint8_t*>(input.data()); const uint8_t* raw_input = reinterpret_cast<const uint8_t*>(input.data());
string output(std::min(woff2::ComputeWOFF2FinalSize(raw_input, input.size()), string output(std::min(woff2::ComputeWOFF2FinalSize(raw_input, input.size()),