X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fext%2Fandroid%2FSparseIntArray.java;h=2b9c4af0467ad60bc7dc7eca4ad6009feae4e529;hb=0e9b7c55df4d5d513d55de806dae32175ab22c84;hp=e286cb478d621afac153775db50fb2798555d1c9;hpb=1c757dc1e6ee864277825c1ebd9c6a9fbe0da7b2;p=jalview.git

diff --git a/src/jalview/ext/android/SparseIntArray.java b/src/jalview/ext/android/SparseIntArray.java
index e286cb4..2b9c4af 100644
--- a/src/jalview/ext/android/SparseIntArray.java
+++ b/src/jalview/ext/android/SparseIntArray.java
@@ -355,6 +355,8 @@ public class SparseIntArray implements Cloneable
    * @param key
    * @oparam toAdd
    * @return the new value of the count for the key
+   * @throw ArithmeticException if the result would exceed the maximum value of
+   *        an int
    */
   public int add(int key, int toAdd)
   {
@@ -362,6 +364,7 @@ public class SparseIntArray implements Cloneable
     int i = ContainerHelpers.binarySearch(mKeys, mSize, key);
     if (i >= 0)
     {
+      checkOverflow(mValues[i], toAdd);
       mValues[i] += toAdd;
       newValue = mValues[i];
     }
@@ -389,4 +392,34 @@ public class SparseIntArray implements Cloneable
     }
     return newValue;
   }
+
+  /**
+   * Throws ArithmeticException if adding addend to value would exceed the range
+   * of int
+   * 
+   * @param value
+   * @param addend
+   */
+  static void checkOverflow(int value, int addend)
+  {
+    /*
+     * test cases being careful to avoid overflow while testing!
+     */
+    if (addend > 0)
+    {
+      if (value > 0 && Integer.MAX_VALUE - value < addend)
+      {
+        throw new ArithmeticException("Integer overflow adding " + addend
+                + " to  " + value);
+      }
+    }
+    else if (addend < 0)
+    {
+      if (value < 0 && Integer.MIN_VALUE - value > addend)
+      {
+        throw new ArithmeticException("Integer underflow adding " + addend
+                + " to  " + value);
+      }
+    }
+  }
 }