InputStreamReader.java (refill): Only call refill on BufferedInputStream when appropr...

	* java/io/InputStreamReader.java (refill): Only call refill on
	BufferedInputStream when appropriate constraints are met.

From-SVN: r44675

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c32cf36d691dee75d172f6b9241d94e61994fc74..270500db31755df6b773fcd15bb76e829cbace75 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-06  Tom Tromey  <tromey@redhat.com>
+
+       * java/io/InputStreamReader.java (refill): Only call refill on
+       BufferedInputStream when appropriate constraints are met.
+
 2001-08-05  Tom Tromey  <tromey@redhat.com>
 
        * java/io/StringWriter.java: Merged with Classpath.

diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java
index 45fd59821ec081711f39aa4456853006e0b344dc..fff979c97acab641876cd4e6004f454d2a5c95cd 100644 (file)
--- a/libjava/java/io/InputStreamReader.java
+++ b/libjava/java/io/InputStreamReader.java
@@ -149,7 +149,9 @@ public class InputStreamReader extends Reader
        // We have knowledge of the internals of BufferedInputStream
        // here.  Eww.
        in.mark (0);
-       boolean r = in.refill ();
+       // BufferedInputStream.refill() can only be called when
+       // `pos>=count'.
+       boolean r = in.pos < in.count || in.refill ();
        in.reset ();
        if (! r)
          return false;