mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Merge pull request #13628 from Snuffleupagus/issue-13626

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

42
src/core/fonts.js
View file

@ -1372,7 +1372,18 @@ class Font {
}
} else if (isSymbolicFont && platformId === 3 && encodingId === 0) {
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) {
@ -1529,7 +1540,14 @@ class Font {
};
}
function sanitizeMetrics(file, header, metrics, numGlyphs, dupFirstEntry) {
function sanitizeMetrics(
file,
header,
metrics,
headTable,
numGlyphs,
dupFirstEntry
) {
if (!header) {
if (metrics) {
metrics.data = null;
@ -1548,19 +1566,24 @@ class Font {
file.pos += 2; // max_extent
file.pos += 2; // caret_slope_rise
file.pos += 2; // caret_slope_run
file.pos += 2; // caret_offset
const caretOffset = file.getUint16();
file.pos += 8; // reserved
file.pos += 2; // format
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) {
info(
"The numOfMetrics (" +
numOfMetrics +
") should not be " +
"greater than the numGlyphs (" +
numGlyphs +
")"
`The numOfMetrics (${numOfMetrics}) should not be ` +
`greater than the numGlyphs (${numGlyphs}).`
);
// Reduce numOfMetrics if it is greater than numGlyphs
numOfMetrics = numGlyphs;
@ -2446,6 +2469,7 @@ class Font {
font,
tables.hhea,
tables.hmtx,
tables.head,
numGlyphsOut,
dupFirstEntry
);