You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by tb...@apache.org on 2012/05/21 16:01:17 UTC
svn commit: r1341030 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
Author: tboehme
Date: Mon May 21 14:01:17 2012
New Revision: 1341030
URL: http://svn.apache.org/viewvc?rev=1341030&view=rev
Log:
PDFBOX-1299: revoke part of last patch because length defined in indirect object is not reliable for sequentially working PDFParser; keep using direct length information for stream reading in BaseParser
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java?rev=1341030&r1=1341029&r2=1341030&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java Mon May 21 14:01:17 2012
@@ -452,11 +452,19 @@ public abstract class BaseParser
{
length = ( (COSNumber) streamLength).intValue();
}
- else if ( ( streamLength instanceof COSObject ) &&
- ( ( (COSObject) streamLength ).getObject() instanceof COSNumber ) )
- {
- length = ( (COSNumber) ( (COSObject) streamLength ).getObject() ).intValue();
- }
+// commented out next chunk since for the sequentially working PDFParser
+// we do not know if length object is redefined later on and the currently
+// read indirect object might be obsolete (e.g. not referenced in xref table);
+// this would result in reading wrong number of bytes;
+// Thus the only reliable information is a direct length.
+// This exclusion shouldn't harm much since in case of indirect objects they will
+// typically be defined after the stream object, thus keeping the directly
+// provided length will fix most cases
+// else if ( ( streamLength instanceof COSObject ) &&
+// ( ( (COSObject) streamLength ).getObject() instanceof COSNumber ) )
+// {
+// length = ( (COSNumber) ( (COSObject) streamLength ).getObject() ).intValue();
+// }
if ( length == -1 )
{