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

Merge pull request #12891 from Snuffleupagus/DefaultAppearanceEvaluator-fixes

Browse Source 
Ensure that `parseDefaultAppearance` won't attempt to access a not yet defined variable (PR 12831 follow-up)
This commit is contained in:
Tim van der Meij 2021-01-23 15:46:42 +01:00 committed by GitHub
commit c9a1d8cb2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/default_appearance.js
View File

@ -37,13 +37,17 @@ class DefaultAppearanceEvaluator extends EvaluatorPreprocessor {
}; };
try { try {
while (this.read(operation)) { while (true) {
if (this.stateManager.stateStack.length !== 0) { operation.args.length = 0; // Ensure that `args` it's always reset.
// Don't get info in save/restore sections.
args.length = 0; if (!this.read(operation)) {
continue; break;
}
if (this.savedStatesDepth !== 0) {
continue; // Don't get info in save/restore sections.
} }
const { fn, args } = operation; const { fn, args } = operation;
switch (fn | 0) { switch (fn | 0) {
case OPS.setFont: case OPS.setFont:
const [fontName, fontSize] = args; const [fontName, fontSize] = args;
@ -64,7 +68,6 @@ class DefaultAppearanceEvaluator extends EvaluatorPreprocessor {
ColorSpace.singletons.cmyk.getRgbItem(args, 0, result.fontColor, 0); ColorSpace.singletons.cmyk.getRgbItem(args, 0, result.fontColor, 0);
break; break;
} }
args.length = 0;
} }
} catch (reason) { } catch (reason) {
warn(`parseDefaultAppearance - ignoring errors: "${reason}".`); warn(`parseDefaultAppearance - ignoring errors: "${reason}".`);

12
test/unit/default_appearance_spec.js
View File

@ -22,10 +22,10 @@ import { Name } from "../../src/core/primitives.js";
describe("Default appearance", function () { describe("Default appearance", function () {
describe("parseDefaultAppearance and createDefaultAppearance", function () { describe("parseDefaultAppearance and createDefaultAppearance", function () {
it("should parse and create default appearance", function () { it("should parse and create default appearance", function () {
const da = "/FontName 12 Tf 0.10 0.20 0.30 rg"; const da = "/F1 12 Tf 0.10 0.20 0.30 rg";
const result = { const result = {
fontSize: 12, fontSize: 12,
fontName: Name.get("FontName"), fontName: Name.get("F1"),
fontColor: new Uint8ClampedArray([26, 51, 76]), fontColor: new Uint8ClampedArray([26, 51, 76]),
}; };
expect(parseDefaultAppearance(da)).toEqual(result); expect(parseDefaultAppearance(da)).toEqual(result);
@ -33,21 +33,21 @@ describe("Default appearance", function () {
expect( expect(
parseDefaultAppearance( parseDefaultAppearance(
" 0.1 0.2 0.3 rg /FontName 12 Tf 0.3 0.2 0.1 rg /NameFont 13 Tf" "0.1 0.2 0.3 rg /F1 12 Tf 0.3 0.2 0.1 rg /F2 13 Tf"
) )
).toEqual({ ).toEqual({
fontSize: 13, fontSize: 13,
fontName: Name.get("NameFont"), fontName: Name.get("F2"),
fontColor: new Uint8ClampedArray([76, 51, 26]), fontColor: new Uint8ClampedArray([76, 51, 26]),
}); });
}); });
it("should parse default appearance with save/restore", function () { it("should parse default appearance with save/restore", function () {
const da = const da =
"0.10 0.20 0.30 rg /FontName 12 Tf q 0.30 0.20 0.10 rg /NameFont 13 Tf Q"; "q Q 0.10 0.20 0.30 rg /F1 12 Tf q 0.30 0.20 0.10 rg /F2 13 Tf Q";
expect(parseDefaultAppearance(da)).toEqual({ expect(parseDefaultAppearance(da)).toEqual({
fontSize: 12, fontSize: 12,
fontName: Name.get("FontName"), fontName: Name.get("F1"),
fontColor: new Uint8ClampedArray([26, 51, 76]), fontColor: new Uint8ClampedArray([26, 51, 76]),
}); });
}); });