diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-07-13 05:41:28 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-07-13 05:41:28 +0000 |
| commit | a9a399fe24303d933a412f01c01bb8e78d97cf9f (patch) | |
| tree | 4aff078d910dc63cd6e5522da1dc415bc661bb0c /libjava/java/io/BufferedInputStream.java | |
| parent | c813baa415260f431f2a5c67312338802cbe5671 (diff) | |
| download | gcc-a9a399fe24303d933a412f01c01bb8e78d97cf9f.zip gcc-a9a399fe24303d933a412f01c01bb8e78d97cf9f.tar.gz gcc-a9a399fe24303d933a412f01c01bb8e78d97cf9f.tar.bz2 | |
re PR libgcj/3426 (java.io.InputStreamReader, infinite loop)
Fix for PR libgcj/3426:
* gnu/gcj/convert/natIconv.cc: Include CharConversionException.h,
errno.h.
(read): Throw exception if character conversion fails.
* java/io/BufferedInputStream.java (refill): Now package-private.
* java/io/InputStreamReader.java (ready): Simplified.
(refill): New method.
(read): Use it.
Co-Authored-By: David Brownell <david-b@pacbell.net>
From-SVN: r43975
Diffstat (limited to 'libjava/java/io/BufferedInputStream.java')
| -rw-r--r-- | libjava/java/io/BufferedInputStream.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/io/BufferedInputStream.java b/libjava/java/io/BufferedInputStream.java index 6473854..15fa936 100644 --- a/libjava/java/io/BufferedInputStream.java +++ b/libjava/java/io/BufferedInputStream.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2001 Free Software Foundation This file is part of libgcj. @@ -131,7 +131,7 @@ public class BufferedInputStream extends FilterInputStream return origN - n; } - private boolean refill() throws IOException + boolean refill() throws IOException { if (markpos < 0) count = pos = 0; |