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:05:22 UTC

svn commit: r1639579 - /pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java

Author: tilman
Date: Fri Nov 14 08:05:20 2014
New Revision: 1639579

URL: http://svn.apache.org/r1639579
Log:
PDFBOX-2498: corrected check for CR LF after EOF, avoid ArrayIndexOutOfBoundsException

Modified:
    pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java

Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java?rev=1639579&r1=1639578&r2=1639579&view=diff
==============================================================================
--- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java (original)
+++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java Fri Nov 14 08:05:20 2014
@@ -896,7 +896,8 @@ 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"));