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 2014/10/30 19:47:21 UTC

svn commit: r1635585 - /pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java

Author: lehmi
Date: Thu Oct 30 18:47:21 2014
New Revision: 1635585

URL: http://svn.apache.org/r1635585
Log:
PDFBOX-2455: ignore missing %%EOF when in lenient mode as proposed by Michele Balistreri

Modified:
    pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java   (contents, props changed)

Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java?rev=1635585&r1=1635584&r2=1635585&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java Thu Oct 30 18:47:21 2014
@@ -649,7 +649,16 @@ public class NonSequentialPDFParser exte
 
         if (bufOff < 0)
         {
-            throw new IOException("Missing end of file marker '" + (new String(EOF_MARKER)) + "'");
+        	if (isLenient) 
+        	{
+        		// in lenient mode the '%%EOF' isn't needed
+        		bufOff = buf.length;
+        		LOG.debug("Missing end of file marker '" + (new String(EOF_MARKER)) + "'");
+        	} 
+        	else 
+        	{
+        		throw new IOException("Missing end of file marker '" + (new String(EOF_MARKER)) + "'");
+        	}
         }
         // ---- find last startxref preceding EOF marker
         bufOff = lastIndexOf(STARTXREF_MARKER, buf, bufOff);

Propchange: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java
------------------------------------------------------------------------------
  Merged /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/NonSequentialPDFParser.java:r1635584