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

Re-factor how we handle missing, corrupt, or empty font-file entries

Browse Source 
This improves the fixes for e.g. issue 9462 and 18941 slightly and allows better fallback behaviour for non-standard fonts.
This commit is contained in:
Jonas Jenwald 2024-10-22 16:41:53 +02:00
parent 63b34114b1
commit 236c8d862e
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/evaluator.js
View File

@ -63,7 +63,6 @@ import {
LocalTilingPatternCache, LocalTilingPatternCache,
RegionalImageCache, RegionalImageCache,
} from "./image_utils.js"; } from "./image_utils.js";
import { NullStream, Stream } from "./stream.js";
import { BaseStream } from "./base_stream.js"; import { BaseStream } from "./base_stream.js";
import { bidi } from "./bidi.js"; import { bidi } from "./bidi.js";
import { ColorSpace } from "./colorspace.js"; import { ColorSpace } from "./colorspace.js";
@ -77,6 +76,7 @@ import { ImageResizer } from "./image_resizer.js";
import { MurmurHash3_64 } from "../shared/murmurhash3.js"; import { MurmurHash3_64 } from "../shared/murmurhash3.js";
import { OperatorList } from "./operator_list.js"; import { OperatorList } from "./operator_list.js";
import { PDFImage } from "./image.js"; import { PDFImage } from "./image.js";
import { Stream } from "./stream.js";
const DefaultPartialEvaluatorOptions = Object.freeze({ const DefaultPartialEvaluatorOptions = Object.freeze({
maxImageSize: -1, maxImageSize: -1,
@ -4425,27 +4425,25 @@ class PartialEvaluator {
let fontFile, subtype, length1, length2, length3; let fontFile, subtype, length1, length2, length3;
try { try {
fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3"); fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3");
if (fontFile) {
if (!(fontFile instanceof BaseStream)) {
throw new FormatError("FontFile should be a stream");
} else if (fontFile.isEmpty) {
throw new FormatError("FontFile is empty");
}
}
} catch (ex) { } catch (ex) {
if (!this.options.ignoreErrors) { if (!this.options.ignoreErrors) {
throw ex; throw ex;
} }
warn(`translateFont - fetching "${fontName.name}" font file: "${ex}".`); warn(`translateFont - fetching "${fontName.name}" font file: "${ex}".`);
fontFile = new NullStream(); fontFile = null;
} }
let isInternalFont = false; let isInternalFont = false;
let glyphScaleFactors = null; let glyphScaleFactors = null;
let systemFontInfo = null; let systemFontInfo = null;
if (fontFile) { if (fontFile) {
if (!(fontFile instanceof BaseStream)) {
const msg = `Font file should be a Stream in "${fontName.name}".`;
if (!this.options.ignoreErrors) {
throw new FormatError(msg);
}
warn(msg);
fontFile = new NullStream();
}
if (fontFile.dict) { if (fontFile.dict) {
const subtypeEntry = fontFile.dict.get("Subtype"); const subtypeEntry = fontFile.dict.get("Subtype");
if (subtypeEntry instanceof Name) { if (subtypeEntry instanceof Name) {