Merge pull request #12891 from Snuffleupagus/DefaultAppearanceEvaluat…

…or-fixes Ensure that `parseDefaultAppearance` won't attempt to access a not yet defined variable (PR 12831 follow-up)
mozilla · Jan 23, 2021 · c9a1d8c · c9a1d8c
2 parents 6ffb6b1 + ef1d33a
commit c9a1d8c
Show file tree

Hide file tree

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

diff --git a/test/unit/default_appearance_spec.js b/test/unit/default_appearance_spec.js
@@ -22,32 +22,32 @@ import { Name } from "../../src/core/primitives.js";
 describe("Default appearance", function () {
   describe("parseDefaultAppearance and createDefaultAppearance", 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 = {
         fontSize: 12,
-        fontName: Name.get("FontName"),
+        fontName: Name.get("F1"),
         fontColor: new Uint8ClampedArray([26, 51, 76]),
       };
       expect(parseDefaultAppearance(da)).toEqual(result);
       expect(createDefaultAppearance(result)).toEqual(da);
 
       expect(
         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({
         fontSize: 13,
-        fontName: Name.get("NameFont"),
+        fontName: Name.get("F2"),
         fontColor: new Uint8ClampedArray([76, 51, 26]),
       });
     });
 
     it("should parse default appearance with save/restore", function () {
       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({
         fontSize: 12,
-        fontName: Name.get("FontName"),
+        fontName: Name.get("F1"),
         fontColor: new Uint8ClampedArray([26, 51, 76]),
       });
     });