Changeset 904

Timestamp:

04/13/14 14:04:31 (10 years ago)

Author:

davidb

Message:

Some error checks added in to array bound access in y-span

File:

• trunk/src/org/expeditee/io/flowlayout/XGroupItem.java (modified) (2 diffs)

trunk/src/org/expeditee/io/flowlayout/XGroupItem.java

@@ -217 +217 @@
                 int y_index = y - getBoundingYTop();
                 
+                if ((y_index<0) || (y_index>=yitems_span_array.length)) {
+                    int y_top = getBoundingYTop();
+                    int y_bot = y_top + yitems_span_array.length -1;
+                    System.err.println("Error in getYOverlappingItemsSpan(): index out of bounds for value " + y);
+                    System.err.println("  => Operation mapped into local array: y-top=" + y_top + ", y-bot=" + y_bot);
+                    return null;
+                }
                 return yitems_span_array[y_index];
         }
@@ -223 +230 @@
         {
                 int y_index = y - getBoundingYTop();
-                
+
+                if ((y_index<0) || (y_index>=yitems_span_array.length)) {
+                    int y_top = getBoundingYTop();
+                    int y_bot = y_top + yitems_span_array.length -1;
+                    System.err.println("Error in setYOverlappingItemsSpan(): index out of bounds for value " + y);
+                    System.err.println("  => Operation mapped into local array: y-top=" + y_top + ", y-bot=" + y_bot);
+                    return;
+                }
                 yitems_span_array[y_index] = yitems_span;
         }