Merge pull request #13628 from Snuffleupagus/issue-13626

Check that TrueType (3, 0) cmap tables, for symbolic fonts, are sorted correctly (issue 13626)
This commit is contained in:
Tim van der Meij 2021-06-26 14:17:11 +02:00 committed by GitHub
commit d7f8a0e9b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 9 deletions

View File

@ -1372,7 +1372,18 @@ class Font {
} }
} else if (isSymbolicFont && platformId === 3 && encodingId === 0) { } else if (isSymbolicFont && platformId === 3 && encodingId === 0) {
useTable = true; useTable = true;
canBreak = true;
let correctlySorted = true;
if (i < numTables - 1) {
const nextBytes = file.peekBytes(2),
nextPlatformId = int16(nextBytes[0], nextBytes[1]);
if (nextPlatformId < platformId) {
correctlySorted = false;
}
}
if (correctlySorted) {
canBreak = true;
}
} }
if (useTable) { if (useTable) {
@ -1529,7 +1540,14 @@ class Font {
}; };
} }
function sanitizeMetrics(file, header, metrics, numGlyphs, dupFirstEntry) { function sanitizeMetrics(
file,
header,
metrics,
headTable,
numGlyphs,
dupFirstEntry
) {
if (!header) { if (!header) {
if (metrics) { if (metrics) {
metrics.data = null; metrics.data = null;
@ -1548,19 +1566,24 @@ class Font {
file.pos += 2; // max_extent file.pos += 2; // max_extent
file.pos += 2; // caret_slope_rise file.pos += 2; // caret_slope_rise
file.pos += 2; // caret_slope_run file.pos += 2; // caret_slope_run
file.pos += 2; // caret_offset const caretOffset = file.getUint16();
file.pos += 8; // reserved file.pos += 8; // reserved
file.pos += 2; // format file.pos += 2; // format
let numOfMetrics = file.getUint16(); let numOfMetrics = file.getUint16();
if (caretOffset !== 0) {
const macStyle = int16(headTable.data[44], headTable.data[45]);
if (!(macStyle & 2)) {
// Suppress OTS warnings about the `caretOffset` in the hhea-table.
header.data[22] = 0;
header.data[23] = 0;
}
}
if (numOfMetrics > numGlyphs) { if (numOfMetrics > numGlyphs) {
info( info(
"The numOfMetrics (" + `The numOfMetrics (${numOfMetrics}) should not be ` +
numOfMetrics + `greater than the numGlyphs (${numGlyphs}).`
") should not be " +
"greater than the numGlyphs (" +
numGlyphs +
")"
); );
// Reduce numOfMetrics if it is greater than numGlyphs // Reduce numOfMetrics if it is greater than numGlyphs
numOfMetrics = numGlyphs; numOfMetrics = numGlyphs;
@ -2446,6 +2469,7 @@ class Font {
font, font,
tables.hhea, tables.hhea,
tables.hmtx, tables.hmtx,
tables.head,
numGlyphsOut, numGlyphsOut,
dupFirstEntry dupFirstEntry
); );

View File

@ -0,0 +1 @@
https://github.com/mozilla/pdf.js/files/6715502/test.pdf

View File

@ -1643,6 +1643,13 @@
"rounds": 1, "rounds": 1,
"type": "eq" "type": "eq"
}, },
{ "id": "issue13626",
"file": "pdfs/issue13626.pdf",
"md5": "68bc1c2459d56e8c33f5a12a88c9df7d",
"link": true,
"rounds": 1,
"type": "eq"
},
{ "id": "simpletype3font-text", { "id": "simpletype3font-text",
"file": "pdfs/simpletype3font.pdf", "file": "pdfs/simpletype3font.pdf",
"md5": "b374c7543920840c61999e9e86939f99", "md5": "b374c7543920840c61999e9e86939f99",