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 2020/08/06 06:13:39 UTC
svn commit: r1880628 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadView.java
Author: lehmi
Date: Thu Aug 6 06:13:39 2020
New Revision: 1880628
URL: http://svn.apache.org/viewvc?rev=1880628&view=rev
Log:
PDFBOX-4836: add eof-check to peek()
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadView.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadView.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadView.java?rev=1880628&r1=1880627&r2=1880628&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadView.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadView.java Thu Aug 6 06:13:39 2020
@@ -79,8 +79,7 @@ public class RandomAccessReadView implem
@Override
public int read() throws IOException
{
- checkClosed();
- if (currentPosition >= streamLength)
+ if (isEOF())
{
return -1;
}
@@ -108,8 +107,7 @@ public class RandomAccessReadView implem
@Override
public int read(byte[] b, int off, int len) throws IOException
{
- checkClosed();
- if (currentPosition >= streamLength)
+ if (isEOF())
{
return 0;
}
@@ -164,7 +162,10 @@ public class RandomAccessReadView implem
@Override
public int peek() throws IOException
{
- checkClosed();
+ if (isEOF())
+ {
+ return -1;
+ }
restorePosition();
return randomAccessRead.peek();
}