From 64007e777e6a84cafb02c19b61cf411eb473331f Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Wed, 23 Apr 2025 09:55:04 +0200
Subject: [PATCH] Ensure that the /Form XObject /Resources-entry is actually a
 dictionary (issue 19848)

---
 src/core/evaluator.js    |  22 +++++++++++++++-------
 test/pdfs/.gitignore     |   1 +
 test/pdfs/issue19848.pdf | Bin 0 -> 6803 bytes
 test/test_manifest.json  |  14 ++++++++++++++
 4 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 test/pdfs/issue19848.pdf

diff --git a/src/core/evaluator.js b/src/core/evaluator.js
index 50380aea7..e84bad23e 100644
--- a/src/core/evaluator.js
+++ b/src/core/evaluator.js
@@ -465,7 +465,7 @@ class PartialEvaluator {
     localColorSpaceCache,
     seenRefs
   ) {
-    const dict = xobj.dict;
+    const { dict } = xobj;
     const matrix = lookupMatrix(dict.getArray("Matrix"), null);
     const bbox = lookupNormalRect(dict.getArray("BBox"), null);
 
@@ -521,10 +521,12 @@ class PartialEvaluator {
     const args = [f32matrix, f32bbox];
     operatorList.addOp(OPS.paintFormXObjectBegin, args);
 
+    const localResources = dict.get("Resources");
+
     await this.getOperatorList({
       stream: xobj,
       task,
-      resources: dict.get("Resources") || resources,
+      resources: localResources instanceof Dict ? localResources : resources,
       operatorList,
       initialState,
       prevRefs: seenRefs,
@@ -3298,14 +3300,15 @@ class PartialEvaluator {
                 if (!(xobj instanceof BaseStream)) {
                   throw new FormatError("XObject should be a stream");
                 }
+                const { dict } = xobj;
 
-                const type = xobj.dict.get("Subtype");
+                const type = dict.get("Subtype");
                 if (!(type instanceof Name)) {
                   throw new FormatError("XObject should have a Name subtype");
                 }
 
                 if (type.name !== "Form") {
-                  emptyXObjectCache.set(name, xobj.dict.objId, true);
+                  emptyXObjectCache.set(name, dict.objId, true);
 
                   resolveXObject();
                   return;
@@ -3319,11 +3322,13 @@ class PartialEvaluator {
                 const currentState = stateManager.state.clone();
                 const xObjStateManager = new StateManager(currentState);
 
-                const matrix = lookupMatrix(xobj.dict.getArray("Matrix"), null);
+                const matrix = lookupMatrix(dict.getArray("Matrix"), null);
                 if (matrix) {
                   xObjStateManager.transform(matrix);
                 }
 
+                const localResources = dict.get("Resources");
+
                 // Enqueue the `textContent` chunk before parsing the /Form
                 // XObject.
                 enqueueChunk();
@@ -3348,7 +3353,10 @@ class PartialEvaluator {
                   .getTextContent({
                     stream: xobj,
                     task,
-                    resources: xobj.dict.get("Resources") || resources,
+                    resources:
+                      localResources instanceof Dict
+                        ? localResources
+                        : resources,
                     stateManager: xObjStateManager,
                     includeMarkedContent,
                     sink: sinkWrapper,
@@ -3362,7 +3370,7 @@ class PartialEvaluator {
                   })
                   .then(function () {
                     if (!sinkWrapper.enqueueInvoked) {
-                      emptyXObjectCache.set(name, xobj.dict.objId, true);
+                      emptyXObjectCache.set(name, dict.objId, true);
                     }
                     resolveXObject();
                   }, rejectXObject);
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
index 9c4b08a8e..7d5ba5fc3 100644
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@ -473,6 +473,7 @@
 !issue6069.pdf
 !issue6106.pdf
 !issue6296.pdf
+!issue19848.pdf
 !bug852992_reduced.pdf
 !issue13271.pdf
 !issue6298.pdf
diff --git a/test/pdfs/issue19848.pdf b/test/pdfs/issue19848.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..45be7ea0e130b2153f27c10a26899b89aac5da1b
GIT binary patch
literal 6803
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

literal 0
HcmV?d00001

diff --git a/test/test_manifest.json b/test/test_manifest.json
index 002bf23ab..2ffe7549f 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -3886,6 +3886,20 @@
     "rounds": 1,
     "type": "eq"
   },
+  {
+    "id": "issue19848-eq",
+    "file": "pdfs/issue19848.pdf",
+    "md5": "a6b05b61c883542e647b9a5a628e6422",
+    "rounds": 1,
+    "type": "eq"
+  },
+  {
+    "id": "issue19848-text",
+    "file": "pdfs/issue19848.pdf",
+    "md5": "a6b05b61c883542e647b9a5a628e6422",
+    "rounds": 1,
+    "type": "text"
+  },
   {
     "id": "issue14824",
     "file": "pdfs/issue14824.pdf",