fixes processing#2341 - inconsistent bounds checks

jordanorelli · jordanorelli · commit e6acbba7352d · 2014-02-02T22:27:02.000-05:00
The core datastructure IntLost, FloatList, and StringList all have
unsafe .get methods that do not perform bounds checking. This is in
contrast to their .remove methods, which do perform bounds checking.
Prior to this patch, the following would print 0:

    IntList il = new IntList();
    println(il.get(5));

But if we tried to *remove* that element, we would get an
ArrayIndexOutOfBoundException:

    il.remove(5);

This patch causes calls to .get to throw exceptions instead of returning
0 (or null in the case of StringList) for uninitialized values.
diff --git a/core/src/processing/data/FloatList.java b/core/src/processing/data/FloatList.java
@@ -110,6 +110,9 @@ public void clear() {
    * @brief Get an entry at a particular index
    */
   public float get(int index) {
+    if (index >= count) {
+      throw new ArrayIndexOutOfBoundsException(index);
+    }
     return data[index];
   }
 
diff --git a/core/src/processing/data/IntList.java b/core/src/processing/data/IntList.java
@@ -130,6 +130,9 @@ public void clear() {
    * @brief Get an entry at a particular index
    */
   public int get(int index) {
+    if (index >= this.count) {
+      throw new ArrayIndexOutOfBoundsException(index);
+    }
     return data[index];
   }
 
diff --git a/core/src/processing/data/StringList.java b/core/src/processing/data/StringList.java
@@ -113,6 +113,9 @@ public void clear() {
    * @brief Get an entry at a particular index
    */
   public String get(int index) {
+    if (index >= count) {
+      throw new ArrayIndexOutOfBoundsException(index);
+    }
     return data[index];
   }
 

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,9 @@ public void clear() {`
`110`	`110`	`* @brief Get an entry at a particular index`
`111`	`111`	`*/`
`112`	`112`	`public float get(int index) {`
	`113`	`+ if (index >= count) {`
	`114`	`+ throw new ArrayIndexOutOfBoundsException(index);`
	`115`	`+ }`
`113`	`116`	`return data[index];`
`114`	`117`	`}`
`115`	`118`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,9 @@ public void clear() {`
`130`	`130`	`* @brief Get an entry at a particular index`
`131`	`131`	`*/`
`132`	`132`	`public int get(int index) {`
	`133`	`+ if (index >= this.count) {`
	`134`	`+ throw new ArrayIndexOutOfBoundsException(index);`
	`135`	`+ }`
`133`	`136`	`return data[index];`
`134`	`137`	`}`
`135`	`138`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ public void clear() {`
`113`	`113`	`* @brief Get an entry at a particular index`
`114`	`114`	`*/`
`115`	`115`	`public String get(int index) {`
	`116`	`+ if (index >= count) {`
	`117`	`+ throw new ArrayIndexOutOfBoundsException(index);`
	`118`	`+ }`
`116`	`119`	`return data[index];`
`117`	`120`	`}`
`118`	`121`