Changeset 15079 in josm

Timestamp:

2019-05-15T22:41:37+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17691 - fix issue where SimilarNamedWay crashes on a subset of names (patch by taylor.smock)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java

@@ -245 +245 @@
             for (int i = 0; i < words.length; i++) {
                 String word = words[i];
-                part = name.substring(start, start + word.length());
+                if (start + word.length() <= name.length()) {
+                    part = name.substring(start, start + word.length());
+                }
                 if (word.equalsIgnoreCase(part)) {
                     break;

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java

@@ -130 +130 @@
         checkSimilarity("case only", "Rue éèçàïù", "Rue EeCAIU", true);
     }
+
+     /**
+      * Test names that previously caused a crash
+      */
+     @Test
+     public void testSimilarNamesRegression() {
+         assertFalse(test.similaryName("Unnecessary Name", "Third"));
+     }
 }