You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2017/10/23 20:00:04 UTC
svn commit: r1813072 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Author: lehmi
Date: Mon Oct 23 20:00:04 2017
New Revision: 1813072
URL: http://svn.apache.org/viewvc?rev=1813072&view=rev
Log:
PDFBOX-3977: search for root/info entries if the trailer values can't be resolved
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1813072&r1=1813071&r2=1813072&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Mon Oct 23 20:00:04 2017
@@ -2034,6 +2034,8 @@ public class COSParser extends BaseParse
trailer = xrefTrailerResolver.getTrailer();
getDocument().setTrailer(trailer);
List<COSObjectKey[]> trailerObjects = bfSearchForTrailer();
+ boolean rootFound = false;
+ boolean infoFound = false;
if (trailerObjects.size() == 1)
{
COSObjectKey[] trailerObj = trailerObjects.get(0);
@@ -2047,6 +2049,7 @@ public class COSParser extends BaseParse
if (rootDict != null && isCatalog(rootDict))
{
trailer.setItem(COSName.ROOT, document.getObjectFromPool(rootKey));
+ rootFound = true;
}
}
if (infoKey != null && infoOffset != null)
@@ -2055,10 +2058,11 @@ public class COSParser extends BaseParse
if (infoDict != null && isInfo(infoDict))
{
trailer.setItem(COSName.INFO, document.getObjectFromPool(infoKey));
+ infoFound = true;
}
}
}
- else
+ if (!rootFound || !infoFound)
{
// search for the different parts of the trailer dictionary
for (Entry<COSObjectKey, Long> entry : bfSearchCOSObjectKeyOffsets.entrySet())