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 2014/12/05 08:07:25 UTC
svn commit: r1643168 -
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
Author: tilman
Date: Fri Dec 5 07:07:25 2014
New Revision: 1643168
URL: http://svn.apache.org/viewvc?rev=1643168&view=rev
Log:
PDFBOX-2541: avoid ClassCastException for malformed object references
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java?rev=1643168&r1=1643167&r2=1643168&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java Fri Dec 5 07:07:25 2014
@@ -245,17 +245,27 @@ public abstract class BaseParser
private COSBase parseCOSDictionaryValue() throws IOException
{
COSBase retval = null;
+ long numOffset = pdfSource.getOffset();
COSBase number = parseDirObject();
skipSpaces();
char next = (char)pdfSource.peek();
if( next >= '0' && next <= '9' )
{
+ long genOffset = pdfSource.getOffset();
COSBase generationNumber = parseDirObject();
skipSpaces();
char r = (char)pdfSource.read();
if( r != 'R' )
{
- throw new IOException( "expected='R' actual='" + r + "' at offset " + pdfSource.getOffset());
+ throw new IOException("expected='R' actual='" + r + "' at offset " + pdfSource.getOffset());
+ }
+ if (!(number instanceof COSInteger))
+ {
+ throw new IOException("expected number, actual=" + number + " at offset " + numOffset);
+ }
+ if (!(generationNumber instanceof COSInteger))
+ {
+ throw new IOException("expected number, actual=" + number + " at offset " + genOffset);
}
COSObjectKey key = new COSObjectKey(((COSInteger) number).intValue(),
((COSInteger) generationNumber).intValue());