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

[Regression] Convert Catalog.builtInCMapCache into a Map, instead of an Object, to ensure that it's correctly reset (PR 8064 follow-up)

Browse Source 
With the `builtInCMapCache` being a simple Object, it unfortunately means that the `Catalog.cleanup` method isn't resetting it as intended.
By just replacing the `builtInCMapCache` with an empty Object, existing references to it will not actually be updated. The result is that e.g. `Page` instances still keeps references to, what should have been removed, CMap data.

To fix these problems, the `builtInCMapCache` is converted into a `Map` instead (since it can be easily reset).
This commit is contained in:
Jonas Jenwald 2018-07-25 16:11:48 +02:00
parent 51b0e60f9b
commit 81b471c781
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/evaluator.js
View File

@ -132,16 +132,15 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
this.pdfFunctionFactory = pdfFunctionFactory; this.pdfFunctionFactory = pdfFunctionFactory;
this.fetchBuiltInCMap = (name) => { this.fetchBuiltInCMap = (name) => {
var cachedCMap = this.builtInCMapCache[name]; if (this.builtInCMapCache.has(name)) {
if (cachedCMap) { return Promise.resolve(this.builtInCMapCache.get(name));
return Promise.resolve(cachedCMap);
} }
return this.handler.sendWithPromise('FetchBuiltInCMap', { return this.handler.sendWithPromise('FetchBuiltInCMap', {
name, name,
}).then((data) => { }).then((data) => {
if (data.compressionType !== CMapCompressionType.NONE) { if (data.compressionType !== CMapCompressionType.NONE) {
// Given the size of uncompressed CMaps, only cache compressed ones. // Given the size of uncompressed CMaps, only cache compressed ones.
this.builtInCMapCache[name] = data; this.builtInCMapCache.set(name, data);
} }
return data; return data;
}); });

4
src/core/obj.js
View File

@ -38,7 +38,7 @@ var Catalog = (function CatalogClosure() {
} }
this.fontCache = new RefSetCache(); this.fontCache = new RefSetCache();
this.builtInCMapCache = Object.create(null); this.builtInCMapCache = new Map();
this.pageKidsCountCache = new RefSetCache(); this.pageKidsCountCache = new RefSetCache();
// TODO refactor to move getPage() to the PDFDocument. // TODO refactor to move getPage() to the PDFDocument.
this.pageFactory = pageFactory; this.pageFactory = pageFactory;
@ -449,7 +449,7 @@ var Catalog = (function CatalogClosure() {
delete font.translated; delete font.translated;
} }
this.fontCache.clear(); this.fontCache.clear();
this.builtInCMapCache = Object.create(null); this.builtInCMapCache.clear();
}); });
}, },