parent
9bcb180b7c
commit
ee19212577
@ -0,0 +1,21 @@
|
|||||||
|
From dcd5bd8238ea448addd102ff045badd0aca1b990 Mon Sep 17 00:00:00 2001
|
||||||
|
From: crt <chluo@cse.cuhk.edu.hk>
|
||||||
|
Date: Wed, 27 Jul 2022 08:40:02 +0000
|
||||||
|
Subject: pdfseparate: Check XRef's Catalog for being a Dict
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
|
||||||
|
index 351140af..c26a41c4 100644
|
||||||
|
--- a/poppler/PDFDoc.cc
|
||||||
|
+++ b/poppler/PDFDoc.cc
|
||||||
|
@@ -886,6 +886,10 @@ int PDFDoc::savePageAs(const GooString &name, int pageNo)
|
||||||
|
|
||||||
|
// get and mark output intents etc.
|
||||||
|
Object catObj = getXRef()->getCatalog();
|
||||||
|
+ if (!catObj.isDict()) {
|
||||||
|
+ error(errSyntaxError, -1, "XRef's Catelog is not a dictionary");
|
||||||
|
+ return errOpenFile;
|
||||||
|
+ }
|
||||||
|
Dict *catDict = catObj.getDict();
|
||||||
|
Object pagesObj = catDict->lookup("Pages");
|
||||||
|
Object afObj = catDict->lookupNF("AcroForm").copy();
|
@ -0,0 +1,34 @@
|
|||||||
|
--- a/poppler/PDFDoc.cc
|
||||||
|
+++ b/poppler/PDFDoc.cc
|
||||||
|
@@ -1757,6 +1757,9 @@ void PDFDoc::replacePageDict(int pageNo,
|
||||||
|
{
|
||||||
|
Ref *refPage = getCatalog()->getPageRef(pageNo);
|
||||||
|
Object page = getXRef()->fetch(*refPage);
|
||||||
|
+ if (!page.isDict()) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
Dict *pageDict = page.getDict();
|
||||||
|
pageDict->remove("MediaBoxssdf");
|
||||||
|
pageDict->remove("MediaBox");
|
||||||
|
--- a/utils/pdfunite.cc
|
||||||
|
+++ b/utils/pdfunite.cc
|
||||||
|
@@ -293,9 +293,18 @@ int main(int argc, char *argv[])
|
||||||
|
const PDFRectangle *cropBox = nullptr;
|
||||||
|
if (docs[i]->getCatalog()->getPage(j)->isCropped())
|
||||||
|
cropBox = docs[i]->getCatalog()->getPage(j)->getCropBox();
|
||||||
|
- docs[i]->replacePageDict(j, docs[i]->getCatalog()->getPage(j)->getRotate(), docs[i]->getCatalog()->getPage(j)->getMediaBox(), cropBox);
|
||||||
|
Ref *refPage = docs[i]->getCatalog()->getPageRef(j);
|
||||||
|
Object page = docs[i]->getXRef()->fetch(*refPage);
|
||||||
|
+ if (!page.isDict()) {
|
||||||
|
+ fclose(f);
|
||||||
|
+ delete yRef;
|
||||||
|
+ delete countRef;
|
||||||
|
+ delete outStr;
|
||||||
|
+ error(errSyntaxError, -1, "PDFDoc::replacePageDict failed.");
|
||||||
|
+ return -1;
|
||||||
|
+ } else {
|
||||||
|
+ docs[i]->replacePageDict(j, docs[i]->getCatalog()->getPage(j)->getRotate(), docs[i]->getCatalog()->getPage(j)->getMediaBox(), cropBox);
|
||||||
|
+ }
|
||||||
|
Dict *pageDict = page.getDict();
|
||||||
|
Object *resDict = docs[i]->getCatalog()->getPage(j)->getResourceDictObject();
|
||||||
|
if (resDict->isDict()) {
|
@ -0,0 +1,48 @@
|
|||||||
|
From efb68686784f0c58668b7ced990fd173e09346db Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Thu, 18 Aug 2022 23:41:24 +0200
|
||||||
|
Subject: pdfunite: Don't crash in broken documents
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
|
||||||
|
index 86e75555..a154f40d 100644
|
||||||
|
--- a/utils/pdfunite.cc
|
||||||
|
+++ b/utils/pdfunite.cc
|
||||||
|
@@ -106,16 +106,21 @@ static void doMergeNameDict(PDFDoc *doc, XRef *srcXRef, XRef *countRef, int oldR
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void doMergeFormDict(Dict *srcFormDict, Dict *mergeFormDict, int numOffset)
|
||||||
|
+static bool doMergeFormDict(Dict *srcFormDict, Dict *mergeFormDict, int numOffset)
|
||||||
|
{
|
||||||
|
Object srcFields = srcFormDict->lookup("Fields");
|
||||||
|
Object mergeFields = mergeFormDict->lookup("Fields");
|
||||||
|
if (srcFields.isArray() && mergeFields.isArray()) {
|
||||||
|
for (int i = 0; i < mergeFields.arrayGetLength(); i++) {
|
||||||
|
const Object &value = mergeFields.arrayGetNF(i);
|
||||||
|
+ if (!value.isRef()) {
|
||||||
|
+ error(errSyntaxError, -1, "Fields object is not a Ref.");
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
srcFields.arrayAdd(Object({ value.getRef().num + numOffset, value.getRef().gen }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
@@ -332,7 +337,13 @@ int main(int argc, char *argv[])
|
||||||
|
if (afObj.isNull()) {
|
||||||
|
afObj = pageCatDict->lookupNF("AcroForm").copy();
|
||||||
|
} else if (afObj.isDict()) {
|
||||||
|
- doMergeFormDict(afObj.getDict(), pageForm.getDict(), numOffset);
|
||||||
|
+ if (!doMergeFormDict(afObj.getDict(), pageForm.getDict(), numOffset)) {
|
||||||
|
+ fclose(f);
|
||||||
|
+ delete yRef;
|
||||||
|
+ delete countRef;
|
||||||
|
+ delete outStr;
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
objectsCount += docs[i]->writePageObjects(outStr, yRef, numOffset, true);
|
@ -0,0 +1,41 @@
|
|||||||
|
From 4631115647c1e4f0482ffe0491c2f38d2231337b Mon Sep 17 00:00:00 2001
|
||||||
|
From: crt <chluo@cse.cuhk.edu.hk>
|
||||||
|
Date: Fri, 29 Jul 2022 20:51:11 +0000
|
||||||
|
Subject: Check isDict before calling getDict
|
||||||
|
|
||||||
|
Issue #1276
|
||||||
|
|
||||||
|
diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
|
||||||
|
index b96b0378..050927d3 100644
|
||||||
|
--- a/utils/pdfunite.cc
|
||||||
|
+++ b/utils/pdfunite.cc
|
||||||
|
@@ -197,6 +197,14 @@ int main(int argc, char *argv[])
|
||||||
|
Object ocObj;
|
||||||
|
if (docs.size() >= 1) {
|
||||||
|
Object catObj = docs[0]->getXRef()->getCatalog();
|
||||||
|
+ if(!catObj.isDict()){
|
||||||
|
+ fclose(f);
|
||||||
|
+ delete yRef;
|
||||||
|
+ delete countRef;
|
||||||
|
+ delete outStr;
|
||||||
|
+ error(errSyntaxError, -1, "XRef's Catalog is not a dictionary.");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
Dict *catDict = catObj.getDict();
|
||||||
|
intents = catDict->lookup("OutputIntents");
|
||||||
|
afObj = catDict->lookupNF("AcroForm").copy();
|
||||||
|
@@ -295,6 +303,14 @@ int main(int argc, char *argv[])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Object pageCatObj = docs[i]->getXRef()->getCatalog();
|
||||||
|
+ if(!pageCatObj.isDict()){
|
||||||
|
+ fclose(f);
|
||||||
|
+ delete yRef;
|
||||||
|
+ delete countRef;
|
||||||
|
+ delete outStr;
|
||||||
|
+ error(errSyntaxError, -1, "XRef's Catalog is not a dictionary.");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
Dict *pageCatDict = pageCatObj.getDict();
|
||||||
|
Object pageNames = pageCatDict->lookup("Names");
|
||||||
|
if (!pageNames.isNull() && pageNames.isDict()) {
|
Loading…
Reference in new issue