Skip to content

Commit

Permalink
A couple of small improvements in the "SaveDocument" handler in `src/…
Browse files Browse the repository at this point in the history
…core/worker.js`

 - 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.
  • Loading branch information
Snuffleupagus committed Sep 15, 2020
1 parent a531c98 commit ed4e7cd
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/core/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
VerbosityLevel,
warn,
} 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 { incrementalUpdate } from "./writer.js";
import { isNodeJS } from "../shared/is_node.js";
Expand Down Expand Up @@ -548,8 +548,7 @@ class WorkerMessageHandler {
return stream.bytes;
}

acroForm = isDict(acroForm) ? acroForm : Dict.empty;
const xfa = acroForm.get("XFA") || [];
const xfa = (acroForm instanceof Dict && acroForm.get("XFA")) || [];
let xfaDatasets = null;
if (Array.isArray(xfa)) {
for (let i = 0, ii = xfa.length; i < ii; i += 2) {
Expand All @@ -568,7 +567,7 @@ class WorkerMessageHandler {
// Get string info from Info in order to compute fileId
const _info = Object.create(null);
const xrefInfo = xref.trailer.get("Info") || null;
if (xrefInfo) {
if (xrefInfo instanceof Dict) {
xrefInfo.forEach((key, value) => {
if (isString(key) && isString(value)) {
_info[key] = stringToPDFString(value);
Expand Down

0 comments on commit ed4e7cd

Please sign in to comment.