Changeset 18819 in josm for trunk

Timestamp:

2023-08-23T13:53:32+02:00 (11 months ago)

Author:

taylor.smock

Message:

See #22652, r18817: Stop parsing gpx files when point elements have invalid coordinates

This adds back the wpt check that was temporarily removed in r18818 to get back
to the previous "known good" state and additionally adds checks for rtept and
trkpt elements.

This also removes a change to build.xml that was accidentally committed in r18818.
The specific change (adding Automatic-Module-Name to the JOSM manifest) will
probably be done in a separate commit in the future.

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/io/GpxParser.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/io/GpxReaderTest.java (modified) (2 diffs)

trunk/build.xml

@@ -188 +188 @@
                 <!-- Indicate that this jar may have version specific classes. Only used in Java9+. -->
                 <attribute name="Multi-Release" value="true"/>
-                <attribute name="Automatic-Module-Name" value="org.openstreetmap.josm"/>
             </manifest>
         </jar>

trunk/src/org/openstreetmap/josm/io/GpxParser.java

@@ -638 +638 @@
                 currentState = states.pop();
                 convertUrlToLink(currentWayPoint.attr);
+                if (!currentWayPoint.isLatLonKnown()) {
+                    throw new SAXException(tr("{0} element does not have valid latitude and/or longitude.", localName));
+                }
                 currentRoute.routePoints.add(currentWayPoint);
                 break;
@@ -643 +646 @@
                 currentState = states.pop();
                 convertUrlToLink(currentWayPoint.attr);
+                if (!currentWayPoint.isLatLonKnown()) {
+                    throw new SAXException(tr("{0} element does not have valid latitude and/or longitude.", localName));
+                }
                 currentTrackSeg.add(currentWayPoint);
                 break;
@@ -649 +655 @@
                 convertUrlToLink(currentWayPoint.attr);
                 currentWayPoint.getExtensions().addAll(currentExtensionCollection);
+                if (!currentWayPoint.isLatLonKnown()) {
+                    currentExtensionCollection.clear();
+                    throw new SAXException(tr("{0} element does not have valid latitude and/or longitude.", localName));
+                }
                 data.waypoints.add(currentWayPoint);
                 currentExtensionCollection.clear();

trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java

@@ -104 +104 @@
 
     @ParameterizedTest
-    @ValueSource(strings = "<gpx><wpt></wpt></gpx>")
+    @ValueSource(strings = {
+            "<gpx><wpt></wpt></gpx>",
+            "<gpx><trk><trkseg><trkpt></trkpt></trkseg></trk></gpx>",
+            "<gpx><rte><rtept></rtept></rte></gpx>"
+    })
     void testIncompleteLocations(String gpx) {
         SAXException saxException = assertThrows(SAXException.class,
@@ -111 +115 @@
         if ("<wpt>".regionMatches(0, gpx, 5, 4)) {
             type = "wpt";
+        } else if ("<trkpt>".regionMatches(0, gpx, 18, 7)) {
+            type = "trkpt";
+        } else if ("<rtept>".regionMatches(0, gpx, 10, 7)) {
+            type = "rtept";
         } else {
             fail("You need to add code to tell us what the exception for \"" + gpx + "\" should be");