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/11/07 06:39:13 UTC
svn commit: r1814460 - in /pdfbox/trunk: ./
pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Author: lehmi
Date: Tue Nov 7 06:39:13 2017
New Revision: 1814460
URL: http://svn.apache.org/viewvc?rev=1814460&view=rev
Log:
PDFBOX-3994: avoid ClassCastException
Modified:
pdfbox/trunk/ (props changed)
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (contents, props changed)
Propchange: pdfbox/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 7 06:39:13 2017
@@ -1,3 +1,3 @@
-/pdfbox/branches/2.0:1760418,1761484,1762133,1763609,1779822,1780783,1780789,1782684,1784450,1792784,1795704,1795712,1799081-1799082,1814046,1814285
+/pdfbox/branches/2.0:1760418,1761484,1762133,1763609,1779822,1780783,1780789,1782684,1784450,1792784,1795704,1795712,1799081-1799082,1814046,1814285,1814459
/pdfbox/branches/no-awt:1618517-1621410
/pdfbox/no-awt:1618514-1618516
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=1814460&r1=1814459&r2=1814460&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 Tue Nov 7 06:39:13 2017
@@ -1665,11 +1665,14 @@ public class COSParser extends BaseParse
if (trailerDict.containsKey(COSName.INFO))
{
COSBase infoObj = trailerDict.getItem(COSName.INFO);
- long objNumber = ((COSObject) infoObj).getObjectNumber();
- int genNumber = ((COSObject) infoObj).getGenerationNumber();
- trailerKeys.append(objNumber).append(" ");
- trailerKeys.append(genNumber).append(" ");
- infoFound = true;
+ if (infoObj instanceof COSObject)
+ {
+ long objNumber = ((COSObject) infoObj).getObjectNumber();
+ int genNumber = ((COSObject) infoObj).getGenerationNumber();
+ trailerKeys.append(objNumber).append(" ");
+ trailerKeys.append(genNumber).append(" ");
+ infoFound = true;
+ }
}
if (rootFound && infoFound)
{
Propchange: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 7 06:39:13 2017
@@ -1,4 +1,4 @@
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java:1641458
-/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java:1779822,1780783,1792784,1792839,1795704,1795712,1811482,1813367
+/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java:1779822,1780783,1792784,1792839,1795704,1795712,1811482,1813367,1814459
/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java:1618517-1621410
/pdfbox/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java:1618514-1618516