diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-02-09 01:54:38 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-02-09 01:54:38 +0000 |
| commit | 8a5f950e04d5f96083ffe0898c072efc51435c28 (patch) | |
| tree | fc5d540faa46fad908ebb1af1c91ae664909af0b /libjava | |
| parent | 1b43b6be4a838d462816c916c0737132eadeca6a (diff) | |
| download | gcc-8a5f950e04d5f96083ffe0898c072efc51435c28.zip gcc-8a5f950e04d5f96083ffe0898c072efc51435c28.tar.gz gcc-8a5f950e04d5f96083ffe0898c072efc51435c28.tar.bz2 | |
re PR libgcj/1913 (reading closed streams throws NullPointerException, not IOException)
From paul@dawa.demon.co.uk. Fix for PR libgcj/1913:
* java/io/InputStreamReader.java (ready, read): Throw IOException
if stream has been closed.
From-SVN: r39553
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/io/InputStreamReader.java | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 43ce2e0..6e0a7b9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2001-02-08 Tom Tromey <tromey@redhat.com> + + From paul@dawa.demon.co.uk. Fix for PR libgcj/1913: + * java/io/InputStreamReader.java (ready, read): Throw IOException + if stream has been closed. + 2001-02-08 Joseph S. Myers <jsm28@cam.ac.uk> * README, gij.cc, java/lang/natClass.cc, java/lang/natSystem.cc: diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java index 73876fb..03a0c3e 100644 --- a/libjava/java/io/InputStreamReader.java +++ b/libjava/java/io/InputStreamReader.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. @@ -71,6 +71,9 @@ public class InputStreamReader extends Reader { synchronized (lock) { + if (in == null) + throw new IOException("Stream closed"); + if (wpos < wcount) return true; if (work == null) @@ -102,6 +105,9 @@ public class InputStreamReader extends Reader { synchronized (lock) { + if (in == null) + throw new IOException("Stream closed"); + int wavail = wcount - wpos; if (wavail > 0) { @@ -136,6 +142,9 @@ public class InputStreamReader extends Reader { synchronized (lock) { + if (in == null) + throw new IOException("Stream closed"); + int wavail = wcount - wpos; if (wavail > 0) return work[wpos++]; |