Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12962 from Snuffleupagus/issue-9462

Browse Source 
Handle errors gracefully, in `PartialEvaluator.translateFont`, when fetching the font file (issue 9462)
This commit is contained in:
Tim van der Meij 2021-02-07 13:08:16 +01:00 committed by GitHub
commit 3d33313e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/evaluator.js
View File

@ -47,6 +47,7 @@ import {
Ref,
RefSet,
} from "./primitives.js";
import { DecodeStream, NullStream } from "./stream.js";
import {
ErrorFont,
Font,
@ -85,7 +86,6 @@ import {
} from "./image_utils.js";
import { bidi } from "./bidi.js";
import { ColorSpace } from "./colorspace.js";
import { DecodeStream } from "./stream.js";
import { getGlyphsUnicode } from "./glyphlist.js";
import { getMetrics } from "./metrics.js";
import { MurmurHash3_64 } from "./murmurhash3.js";
@ -1066,7 +1066,7 @@ class PartialEvaluator {
try {
preEvaluatedFont = this.preEvaluateFont(font);
} catch (reason) {
warn(`loadFont - ignoring preEvaluateFont errors: "${reason}".`);
warn(`loadFont - preEvaluateFont failed: "${reason}".`);
return errorFont();
}
const { descriptor, hash } = preEvaluatedFont;
@ -1156,6 +1156,7 @@ class PartialEvaluator {
this.handler.send("UnsupportedFeature", {
featureId: UNSUPPORTED_FEATURES.errorFontTranslate,
});
warn(`loadFont - translateFont failed: "${reason}".`);
try {
// error, but it's still nice to have font type reported
@ -3459,7 +3460,16 @@ class PartialEvaluator {
throw new FormatError("invalid font name");
}
var fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3");
let fontFile;
try {
fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3");
} catch (ex) {
if (!this.options.ignoreErrors) {
throw ex;
}
warn(`translateFont - fetching "${fontName.name}" font file: "${ex}".`);
fontFile = new NullStream();
}
if (fontFile) {
if (fontFile.dict) {
var subtype = fontFile.dict.get("Subtype");