From be454565bef7db066e0b660d900f7e722226f6d5 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Mon, 19 Feb 2001 05:37:28 +0000 Subject: CharArrayReader.java (CharArrayReader): Throw IllegalArgumentException if constructor arguments are illegal. * java/io/CharArrayReader.java (CharArrayReader): Throw IllegalArgumentException if constructor arguments are illegal. (ready): Return false if no more characters can be read. * java/io/ByteArrayInputStream.java (ByteArrayInputStream): Likewise. From-SVN: r39876 --- libjava/java/io/ByteArrayInputStream.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libjava/java/io/ByteArrayInputStream.java') diff --git a/libjava/java/io/ByteArrayInputStream.java b/libjava/java/io/ByteArrayInputStream.java index 30ba8d7..0d93393 100644 --- a/libjava/java/io/ByteArrayInputStream.java +++ b/libjava/java/io/ByteArrayInputStream.java @@ -40,6 +40,9 @@ public class ByteArrayInputStream extends InputStream public ByteArrayInputStream(byte[] buffer, int offset, int length) { + if (offset < 0 || length < 0 || offset > buffer.length) + throw new IllegalArgumentException(); + buf = buffer; count = offset + length; @@ -47,10 +50,6 @@ public class ByteArrayInputStream extends InputStream count = buf.length; pos = offset; - // TBD: What should we do if pos is neg. or > count? E.g. throw exc. or: - // if (pos < 0 || pos > count) - // pos = 0; - mark = pos; } -- cgit v1.1