Add check for negative offset

sebbASF · sebbASF · commit 6ccf35ec8e35 · 2012-03-13T21:47:50.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1300370 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/io/input/CharSequenceReader.java b/src/main/java/org/apache/commons/io/input/CharSequenceReader.java
@@ -104,7 +104,7 @@ public int read(char[] array, int offset, int length) {
         if (array == null) {
             throw new NullPointerException("Character array is missing");
         }
-        if (length < 0 || (offset + length) > array.length) {
+        if (length < 0 || offset < 0 || (offset + length) > array.length) {
             throw new IndexOutOfBoundsException("Array Size=" + array.length +
                     ", offset=" + offset + ", length=" + length);
         }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public int read(char[] array, int offset, int length) {`
`104`	`104`	`if (array == null) {`
`105`	`105`	`throw new NullPointerException("Character array is missing");`
`106`	`106`	`}`
`107`		`- if (length < 0 \|\| (offset + length) > array.length) {`
	`107`	`+ if (length < 0 \|\| offset < 0 \|\| (offset + length) > array.length) {`
`108`	`108`	`throw new IndexOutOfBoundsException("Array Size=" + array.length +`
`109`	`109`	`", offset=" + offset + ", length=" + length);`
`110`	`110`	`}`