Add validatilon methods to Arrays

Author: peterdettman

core/src/main/java/org/bouncycastle/util/Arrays.java

@@ -1240,4 +1240,30 @@ public static boolean isNullOrEmpty(Object[] array)
     {
         return null == array || array.length < 1;
     }
+
+    public static void validateRange(byte[] buf, int from, int to)
+    {
+        if (buf == null)
+        {
+            throw new NullPointerException("'buf' cannot be null");
+        }
+        if ((from | (buf.length - from) | (to - from) | (buf.length - to)) < 0)
+        {
+            throw new IndexOutOfBoundsException("buf.length: " + buf.length + ", from: " + from + ", to: " + to);
+        }
+    }
+
+    public static void validateSegment(byte[] buf, int off, int len)
+    {
+        if (buf == null)
+        {
+            throw new NullPointerException("'buf' cannot be null");
+        }
+        int available = buf.length - off;
+        int remaining = available - len;
+        if ((off | len | available | remaining) < 0)
+        {
+            throw new IndexOutOfBoundsException("buf.length: " + buf.length + ", off: " + off + ", len: " + len);
+        }
+    }
 }

core/src/main/java/org/bouncycastle/util/io/Streams.java

@@ -5,6 +5,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.bouncycastle.util.Arrays;
+
 /**
  * Utility methods to assist with stream processing.
  */
@@ -160,16 +162,7 @@ public static int readFully(InputStream inStr, byte[] buf, int off, int len)
 
     public static void validateBufferArguments(byte[] buf, int off, int len)
     {
-        if (buf == null)
-        {
-            throw new NullPointerException();
-        }
-        int available = buf.length - off;
-        int remaining = available - len;
-        if ((off | len | available | remaining) < 0)
-        {
-            throw new IndexOutOfBoundsException();
-        }
+        Arrays.validateSegment(buf, off, len);
     }
 
     public static void writeBufTo(ByteArrayOutputStream buf, OutputStream output)