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/11/14 09:10:05 UTC
svn commit: r1639580 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
Author: tilman
Date: Fri Nov 14 08:10:02 2014
New Revision: 1639580
URL: http://svn.apache.org/r1639580
Log:
PDFBOX-2498: corrected check for CR LF after EOF, avoid ArrayIndexOutOfBoundsException
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java?rev=1639580&r1=1639579&r2=1639580&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java Fri Nov 14 08:10:02 2014
@@ -872,10 +872,11 @@ public class PreflightParser extends Non
{
// EOL is authorized
if ((buf.length - tmpOffset) > 2
- || !(buf[tmpOffset] == 10 || buf[tmpOffset] == 13 || buf[tmpOffset + 1] == 10))
+ || (buf.length - tmpOffset == 2 && (buf[tmpOffset] != 13 || buf[tmpOffset + 1] != 10))
+ || (buf.length - tmpOffset == 1 && buf[tmpOffset] != 10))
{
addValidationError(new ValidationError(ERROR_SYNTAX_TRAILER_EOF,
- "File contains data after the last %%EOF sequence at offset "+pdfSource.getOffset()));
+ "File contains data after the last %%EOF sequence at offset " + pdfSource.getOffset()));
}
}
}