Changeset 18496 in josm

Timestamp:

2022-06-21T18:31:54+02:00 (22 months ago)

Author:

taylor.smock

Message:

Fix #22156: ArithmeticException: / by zero in org.openstreetmap.josm.data.osm.search.SearchCompiler$Nth.match

This was caused by nth%: 0, as x % 0 will throw a divide by 0
exception.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -1290 +1290 @@
         }
 
-        private Nth(int nth, boolean modulo) {
+        private Nth(int nth, boolean modulo) throws SearchParseError {
             this.nth = nth;
             this.modulo = modulo;
+            if (this.modulo && this.nth == 0) {
+                throw new SearchParseError(tr("Non-zero integer expected"));
+            }
         }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

@@ -851 +851 @@
         assertFalse(c.match(OsmUtils.createPrimitive("node name=bar")));
     }
+
+    /**
+     * Non-regression test for JOSM #22156
+     * x % 0 throws an ArithmeticException
+     */
+    @Test
+    void testNonRegression22156() {
+        assertThrows(SearchParseError.class, () -> SearchCompiler.compile("nth%: 0"));
+    }
 }