You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2017/09/29 14:31:04 UTC

svn commit: r1810112 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java

Author: tilman
Date: Fri Sep 29 14:31:04 2017
New Revision: 1810112

URL: http://svn.apache.org/viewvc?rev=1810112&view=rev
Log:
PDFBOX-3923, PDFBOX-3935: don't abort xref parsing table when hitting bad offset, just skip bad entry

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=1810112&r1=1810111&r2=1810112&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 Fri Sep 29 14:31:04 2017
@@ -1987,7 +1987,8 @@ public class COSParser extends BaseParse
                 {
                     trailer.setItem(COSName.INFO, document.getObjectFromPool(entry.getKey()));
                 }
-                // TODO encryption dictionary
+                // encryption dictionary, if existing, is lost
+                // We can't run "Algorithm 2" from PDF specification because of missing ID
             }
             catch (IOException exception)
             {
@@ -2329,12 +2330,18 @@ public class COSParser extends BaseParse
                         if (currOffset >= xrefTableStartOffset && currOffset <= source.getPosition())
                         {
                             // PDFBOX-3923: offset points inside this table - that can't be good
-                            throw new IOException("XRefTable offset " + currOffset + 
-                                    " is within xref table for " + currObjID);
+                            // PDFBOX-3935: don't abort (rebuilding trailer would lose encryption 
+                            //              dictionary), just skip
+                            LOG.warn("XRefTable offset " + currOffset + 
+                                    " is within xref table (start offset: " + xrefTableStartOffset + 
+                                    ") for object " + currObjID);
+                        }
+                        else
+                        {
+                            int currGenID = Integer.parseInt(splitString[1]);
+                            COSObjectKey objKey = new COSObjectKey(currObjID, currGenID);
+                            xrefTrailerResolver.setXRef(objKey, currOffset);
                         }
-                        int currGenID = Integer.parseInt(splitString[1]);
-                        COSObjectKey objKey = new COSObjectKey(currObjID, currGenID);
-                        xrefTrailerResolver.setXRef(objKey, currOffset);
                     }
                     catch(NumberFormatException e)
                     {