Changeset 18541 in josm for trunk/src/org/openstreetmap

Timestamp:

2022-08-23T22:33:20+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22250: Abort on XML error elements

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (2 diffs)

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

@@ -202 +202 @@
     }
 
+    private void parseError() throws XMLStreamException {
+        while (parser.hasNext()) {
+            int event = parser.next();
+            if (event == XMLStreamConstants.CHARACTERS) {
+                throwException(parser.getText());
+            } else {
+                throwException("Unknown error element type");
+            }
+        }
+    }
+
     private void parseRemark() throws XMLStreamException {
         while (parser.hasNext()) {
@@ -394 +405 @@
             // we know that Overpass API returns those elements
             Logging.debug(tr("Undefined element ''{0}'' found in input stream. Skipping.", element));
+        } else if ("error".equals(element)) {
+            parseError();
         } else if (printWarning) {
             Logging.info(tr("Undefined element ''{0}'' found in input stream. Skipping.", element));