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

Merge pull request #12375 from Snuffleupagus/emptyDict-set

Browse Source 
Ensure that the empty dictionary won't be accidentally modified, and slightly improve the "SaveDocument" handler in `src/core/worker.js`
This commit is contained in:
Tim van der Meij 2020-09-15 23:04:57 +02:00 committed by GitHub
commit 374aad77c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/primitives.js
View File

@ -171,7 +171,14 @@ var Dict = (function DictClosure() {
}, },
}; };
Dict.empty = new Dict(null); Dict.empty = (function () {
const emptyDict = new Dict(null);
emptyDict.set = (key, value) => {
unreachable("Should not call `set` on the empty dictionary.");
};
return emptyDict;
})();
Dict.merge = function ({ xref, dictArray, mergeSubDicts = false }) { Dict.merge = function ({ xref, dictArray, mergeSubDicts = false }) {
const mergedDict = new Dict(xref); const mergedDict = new Dict(xref);

7
src/core/worker.js
View File

@ -32,7 +32,7 @@ import {
VerbosityLevel, VerbosityLevel,
warn, warn,
} from "../shared/util.js"; } from "../shared/util.js";
import { clearPrimitiveCaches, Dict, isDict, Ref } from "./primitives.js"; import { clearPrimitiveCaches, Dict, Ref } from "./primitives.js";
import { LocalPdfManager, NetworkPdfManager } from "./pdf_manager.js"; import { LocalPdfManager, NetworkPdfManager } from "./pdf_manager.js";
import { incrementalUpdate } from "./writer.js"; import { incrementalUpdate } from "./writer.js";
import { isNodeJS } from "../shared/is_node.js"; import { isNodeJS } from "../shared/is_node.js";
@ -548,8 +548,7 @@ class WorkerMessageHandler {
return stream.bytes; return stream.bytes;
} }
acroForm = isDict(acroForm) ? acroForm : Dict.empty; const xfa = (acroForm instanceof Dict && acroForm.get("XFA")) || [];
const xfa = acroForm.get("XFA") || [];
let xfaDatasets = null; let xfaDatasets = null;
if (Array.isArray(xfa)) { if (Array.isArray(xfa)) {
for (let i = 0, ii = xfa.length; i < ii; i += 2) { for (let i = 0, ii = xfa.length; i < ii; i += 2) {
@ -568,7 +567,7 @@ class WorkerMessageHandler {
// Get string info from Info in order to compute fileId // Get string info from Info in order to compute fileId
const _info = Object.create(null); const _info = Object.create(null);
const xrefInfo = xref.trailer.get("Info") || null; const xrefInfo = xref.trailer.get("Info") || null;
if (xrefInfo) { if (xrefInfo instanceof Dict) {
xrefInfo.forEach((key, value) => { xrefInfo.forEach((key, value) => {
if (isString(key) && isString(value)) { if (isString(key) && isString(value)) {
_info[key] = stringToPDFString(value); _info[key] = stringToPDFString(value);