* java/io/InputStreamReader.java (refill): Only call refill on

	BufferedInputStream when appropriate constraints are met.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44675 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c32cf36..270500d 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 45fd598..fff979c 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;