IO-307 ReaderInputStream#read(byte[] b, int off, int len) should check for valid parameters

sebbASF · sebbASF · commit 55c1430fc712 · 2012-03-14T02:09:41.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1300443 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -40,6 +40,9 @@ The <action> type attribute can be add,update,fix,remove.
 
   <body>
     <release version="2.2" date="TBA">
+      <action issue="IO-307" dev="sebb" type="fix">
+        ReaderInputStream#read(byte[] b, int off, int len) should check for valid parameters
+      </action>        
       <action issue="IO-287" dev="bayard" type="add" due-to="Ron Kuris, Gary Gregory">
         Use terabyte (TB) , petabyte (PB) and exabyte (EB) in FileUtils.byteCountToDisplaySize(long size)
       </action>        
diff --git a/src/main/java/org/apache/commons/io/input/ReaderInputStream.java b/src/main/java/org/apache/commons/io/input/ReaderInputStream.java
@@ -220,6 +220,13 @@ private void fillBuffer() throws IOException {
      */
     @Override
     public int read(byte[] b, int off, int len) throws IOException {
+        if (b == null) {
+            throw new NullPointerException("Byte array must not be null");
+        }
+        if (len < 0 || off < 0 || (off + len) > b.length) {
+            throw new IndexOutOfBoundsException("Array Size=" + b.length +
+                    ", offset=" + off + ", length=" + len);
+        }
         int read = 0;
         if (len == 0) {
             return 0; // Always return 0 if len == 0
