Merge pull request #14111 from Snuffleupagus/bug-1734802

Take the /CIDToGIDMap data into account when computing the hash, in `PartialEvaluator.preEvaluateFont`, for composite fonts (bug 1734802)

src/core/evaluator.js

@@ -81,6 +81,7 @@ import {
   LocalTilingPatternCache,
 } from "./image_utils.js";
 import { NullStream, Stream } from "./stream.js";
+import { BaseStream } from "./base_stream.js";
 import { bidi } from "./bidi.js";
 import { ColorSpace } from "./colorspace.js";
 import { DecodeStream } from "./decode_stream.js";
@@ -3139,7 +3140,7 @@ class PartialEvaluator {
       }
 
       const cidToGidMap = dict.get("CIDToGIDMap");
-      if (isStream(cidToGidMap)) {
+      if (cidToGidMap instanceof BaseStream) {
         cidToGidBytes = cidToGidMap.getBytes();
       }
     }
@@ -3790,6 +3791,16 @@ class PartialEvaluator {
           }
           hash.update(widthsBuf.join());
         }
+
+        const cidToGidMap =
+          dict.getRaw("CIDToGIDMap") || baseDict.getRaw("CIDToGIDMap");
+        if (cidToGidMap instanceof Name) {
+          hash.update(cidToGidMap.name);
+        } else if (cidToGidMap instanceof Ref) {
+          hash.update(cidToGidMap.toString());
+        } else if (cidToGidMap instanceof BaseStream) {
+          hash.update(cidToGidMap.peekBytes());
+        }
       }
     }
 

test/pdfs/bug1734802.pdf.link

@@ -0,0 +1 @@
+https://bugzilla.mozilla.org/attachment.cgi?id=9244936

test/test_manifest.json

@@ -166,6 +166,14 @@
        "rounds": 1,
        "type": "eq"
     },
+    {  "id": "bug1734802",
+       "file": "pdfs/bug1734802.pdf",
+       "md5": "a23ad8af95ffca3876e110a5f4dec9bc",
+       "rounds": 1,
+       "link": true,
+       "lastPage": 3,
+       "type": "eq"
+    },
     {  "id": "bug921760",
        "file": "pdfs/bug921760.pdf",
        "md5": "1aa136d786a65b0d7cce7bdb3c58c6c3",