|
 |
2e1d9e |
--- a/utils/pdfunite.cc
|
|
|
2e1d9e |
+++ b/utils/pdfunite.cc
|
|
|
2e1d9e |
@@ -165,7 +165,9 @@ int main (int argc, char *argv[])
|
|
|
2e1d9e |
for (i = 1; i < argc - 1; i++) {
|
|
|
2e1d9e |
GooString *gfileName = new GooString(argv[i]);
|
|
|
2e1d9e |
PDFDoc *doc = new PDFDoc(gfileName, nullptr, nullptr, nullptr);
|
|
|
2e1d9e |
- if (doc->isOk() && !doc->isEncrypted()) {
|
|
|
2e1d9e |
+ if (doc->isOk() && !doc->isEncrypted() &&
|
|
|
2e1d9e |
+ (doc->getCatalog()->getPageRef(1) || gTrue) &&
|
|
|
2e1d9e |
+ doc->getXRef()->getCatalog().isDict()) {
|
|
|
2e1d9e |
docs.push_back(doc);
|
|
|
2e1d9e |
if (doc->getPDFMajorVersion() > majorVersion) {
|
|
|
2e1d9e |
majorVersion = doc->getPDFMajorVersion();
|
|
|
2e1d9e |
@@ -176,8 +177,13 @@ int main (int argc, char *argv[])
|
|
|
2e1d9e |
}
|
|
|
2e1d9e |
}
|
|
|
2e1d9e |
} else if (doc->isOk()) {
|
|
|
2e1d9e |
- error(errUnimplemented, -1, "Could not merge encrypted files ('{0:s}')", argv[i]);
|
|
|
2e1d9e |
- return -1;
|
|
|
2e1d9e |
+ if (doc->isEncrypted()) {
|
|
|
2e1d9e |
+ error(errUnimplemented, -1, "Could not merge encrypted files ('{0:s}')", argv[i]);
|
|
|
2e1d9e |
+ return -1;
|
|
|
2e1d9e |
+ } else if (!doc->getXRef()->getCatalog().isDict()) {
|
|
|
2e1d9e |
+ error(errSyntaxError, -1, "XRef's Catalog is not a dictionary ('{0:s}')", argv[i]);
|
|
|
2e1d9e |
+ return -1;
|
|
|
2e1d9e |
+ }
|
|
|
2e1d9e |
} else {
|
|
|
2e1d9e |
error(errSyntaxError, -1, "Could not merge damaged documents ('{0:s}')", argv[i]);
|
|
|
2e1d9e |
return -1;
|