|
 |
6dfe52d |
From 7b4e372deeb716eb3fe3a54b31ed41af759224f9 Mon Sep 17 00:00:00 2001
|
|
|
6dfe52d |
From: Marek Kasik <mkasik@redhat.com>
|
|
|
6dfe52d |
Date: Mon, 4 Mar 2019 12:55:12 +0100
|
|
|
6dfe52d |
Subject: [PATCH] pdfunite: Check XRef's Catalog for being a Dict
|
|
|
6dfe52d |
|
|
|
6dfe52d |
Check whether Catalog from XRef is Dict for each document
|
|
|
6dfe52d |
passed to pdfunite and return error if not.
|
|
|
6dfe52d |
|
|
|
6dfe52d |
https://gitlab.freedesktop.org/poppler/poppler/issues/706
|
|
|
6dfe52d |
---
|
|
|
6dfe52d |
utils/pdfunite.cc | 12 +++++++++---
|
|
|
6dfe52d |
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
6dfe52d |
|
|
|
99acecd |
diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
|
|
|
6dfe52d |
index b0142116..23888684 100644
|
|
|
99acecd |
--- a/utils/pdfunite.cc
|
|
|
99acecd |
+++ b/utils/pdfunite.cc
|
|
|
6dfe52d |
@@ -165,7 +165,8 @@ int main (int argc, char *argv[])
|
|
|
99acecd |
for (i = 1; i < argc - 1; i++) {
|
|
|
99acecd |
GooString *gfileName = new GooString(argv[i]);
|
|
|
99acecd |
PDFDoc *doc = new PDFDoc(gfileName, nullptr, nullptr, nullptr);
|
|
|
99acecd |
- if (doc->isOk() && !doc->isEncrypted()) {
|
|
|
6dfe52d |
+ if (doc->isOk() && !doc->isEncrypted() &&
|
|
|
6dfe52d |
+ doc->getXRef()->getCatalog().isDict()) {
|
|
|
99acecd |
docs.push_back(doc);
|
|
|
99acecd |
if (doc->getPDFMajorVersion() > majorVersion) {
|
|
|
99acecd |
majorVersion = doc->getPDFMajorVersion();
|
|
|
6dfe52d |
@@ -176,8 +177,13 @@ int main (int argc, char *argv[])
|
|
|
99acecd |
}
|
|
|
99acecd |
}
|
|
|
6dfe52d |
} else if (doc->isOk()) {
|
|
|
6dfe52d |
- error(errUnimplemented, -1, "Could not merge encrypted files ('{0:s}')", argv[i]);
|
|
|
6dfe52d |
- return -1;
|
|
|
6dfe52d |
+ if (doc->isEncrypted()) {
|
|
|
6dfe52d |
+ error(errUnimplemented, -1, "Could not merge encrypted files ('{0:s}')", argv[i]);
|
|
|
6dfe52d |
+ return -1;
|
|
|
6dfe52d |
+ } else if (!doc->getXRef()->getCatalog().isDict()) {
|
|
|
6dfe52d |
+ error(errSyntaxError, -1, "XRef's Catalog is not a dictionary ('{0:s}')", argv[i]);
|
|
|
6dfe52d |
+ return -1;
|
|
|
6dfe52d |
+ }
|
|
|
99acecd |
} else {
|
|
|
99acecd |
error(errSyntaxError, -1, "Could not merge damaged documents ('{0:s}')", argv[i]);
|
|
|
99acecd |
return -1;
|
|
|
6dfe52d |
--
|
|
|
6dfe52d |
2.20.1
|
|
|
6dfe52d |
|