Changeset 11848 in josm for trunk/src/org/openstreetmap/josm/gui/MapStatus.java

Timestamp:

2017-04-07T00:18:07+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14613 - Special HTML characters not escaped in GUI error messages

File:

• trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -79 +79 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -587 +588 @@
         private JLabel popupBuildPrimitiveLabels(final OsmPrimitive osm) {
             final StringBuilder text = new StringBuilder(32);
-            String name = osm.getDisplayName(DefaultNameFormatter.getInstance());
+            String name = Utils.escapeReservedCharactersHTML(osm.getDisplayName(DefaultNameFormatter.getInstance()));
             if (osm.isNewOrUndeleted() || osm.isModified()) {
                 name = "<i><b>"+ name + "*</b></i>";
@@ -601 +602 @@
 
             if (osm.getUser() != null) {
-                text.append(" [").append(tr("User:")).append(' ').append(osm.getUser().getName()).append(']');
+                text.append(" [").append(tr("User:")).append(' ')
+                    .append(Utils.escapeReservedCharactersHTML(osm.getUser().getName())).append(']');
             }