Changeset 9664 in josm for trunk

Timestamp:

2016-01-28T22:19:39+01:00 (8 years ago)

Author:

wiktorn

Message:

Fix NPE and hang when adding erroneus imageries.

When user points to a getCapabilities document that is XHTML file, parser was by default loading external entities. For XHTML, it was trying to load for ex.: ​http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd - which takes about 15 seconds to load. It referes to other external entities, that take no shorter to load, hence was the hang.

Now factory will not try to load external resources, nor validate the XML, so this should prevent such errors.

See: #12450

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -268 +268 @@
     private Collection<Layer> getCapabilities() throws IOException {
         XMLInputFactory factory = XMLInputFactory.newFactory();
+        // do not try to load external entities, nor validate the XML
+        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
+        factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
+        factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+
         InputStream in = new CachedFile(baseUrl).
                 setHttpHeaders(headers).
@@ -280 +285 @@
             XMLStreamReader reader = factory.createXMLStreamReader(new ByteArrayInputStream(data));
 
-            Collection<Layer> ret = null;
+            Collection<Layer> ret = new ArrayList<>();
             for (int event = reader.getEventType(); reader.hasNext(); event = reader.next()) {
                 if (event == XMLStreamReader.START_ELEMENT) {