Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6631046: BufferedInputStream.available() reports negative int on very large inputstream
authormchung
Fri, 19 Nov 2010 10:00:08 -0800
changeset 7280 81f10887bf74
parent 7279 32ac37aa9367
child 7281 f202e1a7a134
6631046: BufferedInputStream.available() reports negative int on very large inputstream Reviewed-by: dholmes, alanb, mduigou
jdk/src/share/classes/java/io/BufferedInputStream.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/io/PushbackInputStream.java file | annotate | diff | comparison | revisions 
--- a/jdk/src/share/classes/java/io/BufferedInputStream.java	Fri Nov 19 13:35:07 2010 +0000
+++ b/jdk/src/share/classes/java/io/BufferedInputStream.java	Fri Nov 19 10:00:08 2010 -0800
@@ -395,7 +395,11 @@
      *                          or an I/O error occurs.
      */
     public synchronized int available() throws IOException {
-        return getInIfOpen().available() + (count - pos);
+        int n = count - pos;
+        int avail = getInIfOpen().available();
+        return n > (Integer.MAX_VALUE - avail)
+                    ? Integer.MAX_VALUE
+                    : n + avail;
     }
 
     /**
--- a/jdk/src/share/classes/java/io/PushbackInputStream.java	Fri Nov 19 13:35:07 2010 +0000
+++ b/jdk/src/share/classes/java/io/PushbackInputStream.java	Fri Nov 19 10:00:08 2010 -0800
@@ -273,7 +273,11 @@
      */
     public int available() throws IOException {
         ensureOpen();
-        return (buf.length - pos) + super.available();
+        int n = buf.length - pos;
+        int avail = super.available();
+        return n > (Integer.MAX_VALUE - avail)
+                    ? Integer.MAX_VALUE
+                    : n + avail;
     }
 
     /**
jdk-sandbox