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 2023/06/03 08:59:24 UTC
svn commit: r1910197 - in /pdfbox/trunk: io/src/main/java/org/apache/pdfbox/io/RandomAccessRead.java pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
Author: tilman
Date: Sat Jun 3 08:59:24 2023
New Revision: 1910197
URL: http://svn.apache.org/viewvc?rev=1910197&view=rev
Log:
PDFBOX-5606: avoid parser access on closed stream; fix typo
Modified:
pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessRead.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
Modified: pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessRead.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessRead.java?rev=1910197&r1=1910196&r2=1910197&view=diff
==============================================================================
--- pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessRead.java (original)
+++ pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/RandomAccessRead.java Sat Jun 3 08:59:24 2023
@@ -86,7 +86,7 @@ public interface RandomAccessRead extend
/**
* Returns true if this source has been closed.
*
- * @return true is the source has been closed
+ * @return true if the source has been closed
*/
boolean isClosed();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java?rev=1910197&r1=1910196&r2=1910197&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java Sat Jun 3 08:59:24 2023
@@ -95,6 +95,10 @@ public class PDFStreamParser extends Bas
*/
public Object parseNextToken() throws IOException
{
+ if (source.isClosed())
+ {
+ return null;
+ }
skipSpaces();
if (source.isEOF())
{
@@ -233,7 +237,7 @@ public class PDFStreamParser extends Bas
if (!(value instanceof COSBase))
{
LOG.warn("Unexpected token in inline image dictionary at offset " +
- source.getPosition());
+ (source.isClosed() ? "EOF" : source.getPosition()));
break;
}
imageParams.setItem( (COSName)nextToken, (COSBase)value );