[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: DataInputStream fix

Kaffe CVS cvs-commits at kaffe.org
Mon Oct 4 07:19:20 PDT 2004


PatchSet 5246 
Date: 2004/10/04 14:15:24
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: DataInputStream fix

2004-10-04  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/io/DataInputStream.java:
        Resynced with GNU Classpath.

        2004-10-01  Michael Koch  <konqueror at gmx.de>

        * java/io/DataInputStream.java
        (readFully): Throw IndexOutOfBoundsException if len is negative.

Members: 
	ChangeLog:1.2800->1.2801 
	libraries/javalib/java/io/DataInputStream.java:1.20->1.21 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2800 kaffe/ChangeLog:1.2801
--- kaffe/ChangeLog:1.2800	Mon Oct  4 13:32:30 2004
+++ kaffe/ChangeLog	Mon Oct  4 14:15:24 2004
@@ -1,5 +1,15 @@
 2004-10-04  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/io/DataInputStream.java:
+	Resynced with GNU Classpath.
+
+	2004-10-01  Michael Koch  <konqueror at gmx.de>
+
+        * java/io/DataInputStream.java
+        (readFully): Throw IndexOutOfBoundsException if len is negative.
+
+2004-10-04  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java,
 	libraries/javalib/gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java,
 	libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java,
Index: kaffe/libraries/javalib/java/io/DataInputStream.java
diff -u kaffe/libraries/javalib/java/io/DataInputStream.java:1.20 kaffe/libraries/javalib/java/io/DataInputStream.java:1.21
--- kaffe/libraries/javalib/java/io/DataInputStream.java:1.20	Mon Apr 12 11:40:26 2004
+++ kaffe/libraries/javalib/java/io/DataInputStream.java	Mon Oct  4 14:15:27 2004
@@ -279,6 +279,9 @@
    */
   public final void readFully (byte[] buf, int offset, int len) throws IOException
   {
+    if (len < 0)
+      throw new IndexOutOfBoundsException("Negative length: " + len);
+    
     while (len > 0)
       {
 	// in.read will block until some data is available.




More information about the kaffe mailing list