Changeset 36198 in osm for applications

Timestamp:

2023-12-27T16:17:21+01:00 (11 months ago)

Author:

taylor.smock

Message:

See #23367: Give some indication when an integer overflow occurs

In this case, we are throwing an ArithmeticException when an overflow occurs.

Location:

applications/viewer/jmapviewer

Files:

• src/org/openstreetmap/gui/jmapviewer/TileRange.java (modified) (1 diff)
• test/org/openstreetmap/gui/jmapviewer/TileRangeTest.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileRange.java

@@ -48 +48 @@
      * Returns size
      * @return size
+     * @throws ArithmeticException – if the result overflows an int (see {@link Math#multiplyExact(int, int)})
      */
-    public int size() {
+    public int size() throws ArithmeticException {
         int xSpan = maxX - minX + 1;
         int ySpan = maxY - minY + 1;
-        return xSpan * ySpan;
+        return Math.multiplyExact(xSpan, ySpan);
     }
 }

applications/viewer/jmapviewer/test/org/openstreetmap/gui/jmapviewer/TileRangeTest.java

@@ -4 +4 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
@@ -21 +22 @@
                 new TileXY(6, 6), 10).size());
     }
+
+    /**
+     * Ensure that something exceptional happens when an integer overflow happens
+     */
+    @Test
+    void testSizeTooLarge() {
+        final TileRange allZ16 = new TileRange(new TileXY(0, 0), new TileXY(1 << 16, 1 << 16), 16);
+        assertThrows(ArithmeticException.class, allZ16::size);
+    }
 }