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

Timestamp:

2020-04-17T11:41:56+02:00 (5 years ago)

Author:

GerdP

Message:

see #19097: Windows plays alarm sound when opening preset preferences
Avoid to show lots of garbarge on the console when url starts with "data:image/svg+xml" but contains a PNG file
The alarm sound is played when 0x07 is written to the console.

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

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

@@ -65 +65 @@
 import javax.xml.parsers.ParserConfigurationException;
 
-import com.kitfox.svg.SVGDiagram;
-import com.kitfox.svg.SVGException;
-import com.kitfox.svg.SVGUniverse;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -90 +87 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
+
+import com.kitfox.svg.SVGDiagram;
+import com.kitfox.svg.SVGException;
+import com.kitfox.svg.SVGUniverse;
 
 /**
@@ -1017 +1018 @@
             if ("image/svg+xml".equals(mediatype)) {
                 String s = new String(bytes, StandardCharsets.UTF_8);
+                // see #19097: check if s starts with PNG magic
+                if (s.length() > 4 && "PNG".equals(s.substring(1, 4))) {
+                    Logging.warn("url contains PNG file " + url);
+                    return null;
+                }
                 SVGDiagram svg;
                 synchronized (getSvgUniverse()) {