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

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

Browse Source 
This is unfortunately *yet another* bug in the `preEvaluateFont`-implementation, and I've lost count of the number of times I've had to tweak this code over the years :-(
I really cannot help thinking that PR 4423 was way too simplistic, since it missed a bunch of cases that leads to broken font rendering in many PDF documents.

Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1734802
This commit is contained in:
Jonas Jenwald 2021-10-08 12:21:26 +02:00
parent da8df646f5
commit 69a97bcba7
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/evaluator.js
View File

@ -81,6 +81,7 @@ import {
LocalTilingPatternCache, LocalTilingPatternCache,
} from "./image_utils.js"; } from "./image_utils.js";
import { NullStream, Stream } from "./stream.js"; import { NullStream, Stream } from "./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";
import { DecodeStream } from "./decode_stream.js"; import { DecodeStream } from "./decode_stream.js";
@ -3139,7 +3140,7 @@ class PartialEvaluator {
} }
const cidToGidMap = dict.get("CIDToGIDMap"); const cidToGidMap = dict.get("CIDToGIDMap");
if (isStream(cidToGidMap)) { if (cidToGidMap instanceof BaseStream) {
cidToGidBytes = cidToGidMap.getBytes(); cidToGidBytes = cidToGidMap.getBytes();
} }
} }
@ -3790,6 +3791,16 @@ class PartialEvaluator {
} }
hash.update(widthsBuf.join()); 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());
}
} }
} }

1
test/pdfs/bug1734802.pdf.link Normal file
View File

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

8
test/test_manifest.json
View File

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