[cp-patches] FYI: Small InputStream fix

[Jeroen Frijters]

Hi,

Committed.

Regards,
Jeroen

2006-02-12  Jeroen Frijters  <[EMAIL PROTECTED]>

        * java/io/InputStream.java
        (read(byte[],int,int)): Changed argument validation to prevent
        integer overflow. Remove redundant check.

Index: java/io/InputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/InputStream.java,v
retrieving revision 1.10
diff -u -r1.10 InputStream.java
--- java/io/InputStream.java    2 Jul 2005 20:32:38 -0000       1.10
+++ java/io/InputStream.java    10 Feb 2006 11:50:37 -0000
@@ -193,10 +193,8 @@
    */
   public int read(byte[] b, int off, int len) throws IOException
   {
-    if (off < 0 || len < 0 || off + len > b.length)
+    if (off < 0 || len < 0 || b.length - off < len)
       throw new IndexOutOfBoundsException();
-    if (b.length == 0)
-      return 0;
 
     int i, ch;