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

A couple of small improvements in the "SaveDocument" handler in src/core/worker.js

Browse Source 
- Check that the "Info"-entry, in the XRef-trailer, is actually a dictionary before accessing it. This is similar to the `PDFDocument.documentInfo` method and follows the general principal of validating data carefully before accessing it, given how often PDF-software may create corrupt PDF files.

 - Slightly simplify the "XFA"-lookup, since there's no point in trying to fetch something from the empty dictionary.
This commit is contained in:
Jonas Jenwald 2020-09-14 13:31:33 +02:00
parent a531c98cd2
commit ed4e7cd8a4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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);