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:08:13 UTC
svn commit: r1813076 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
Author: lehmi
Date: Mon Oct 23 20:08:13 2017
New Revision: 1813076
URL: http://svn.apache.org/viewvc?rev=1813076&view=rev
Log:
PDFBOX-3976: eliminate the root issue instead of avoiding the NPE
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=1813076&r1=1813075&r2=1813076&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:08:13 2017
@@ -1653,7 +1653,7 @@ public class COSParser extends BaseParse
int genNumber = ((COSObject) infoObj).getGenerationNumber();
trailerKeys[1] = new COSObjectKey(objNumber, genNumber);
}
- if (trailerKeys[0] != null || trailerKeys[1] != null)
+ if (trailerKeys[0] != null && trailerKeys[1] != null)
{
trailerDicts.add(trailerKeys);
}
@@ -1671,15 +1671,12 @@ public class COSParser extends BaseParse
if (trailerdictsSize > 1)
{
COSObjectKey[] first = trailerDicts.get(0);
- if (first[0] != null && first[1] != null)
+ for (int i = trailerdictsSize - 1; i > 0; i--)
{
- for (int i = trailerdictsSize - 1; i > 0; i--)
+ COSObjectKey[] other = trailerDicts.get(i);
+ if (first[0].equals(other[0]) && first[1].equals(other[1]))
{
- COSObjectKey[] other = trailerDicts.get(i);
- if (first[0].equals(other[0]) && first[1].equals(other[1]))
- {
- trailerDicts.remove(other);
- }
+ trailerDicts.remove(other);
}
}
}