Changeset 5580 in josm for trunk/src/org

Timestamp:

2012-11-13T22:48:12+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8191 - Do not load external DTDs when reading (supposed) XML files. When reading W3C XHTML DTD (in case of invalid served XML file), this causes JOSM to hang two minutes.

File:

• trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -30 +30 @@
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
@@ -292 +294 @@
             XMLReader reader = saxParser.getXMLReader();
             reader.setContentHandler(contentHandler);
+            try {
+                // Do not load external DTDs (fix #8191)
+                reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+            } catch (SAXException e) {
+                // Exception very unlikely to happen, so no need to translate this
+                System.err.println("Cannot disable 'load-external-dtd' feature: "+e.getMessage());
+            }
             reader.parse(new InputSource(in));
             queueIterator = queue.iterator();