Changeset 11848 in josm for trunk/src/org/openstreetmap/josm/command

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/command/conflict/ConflictAddCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -41 +42 @@
                         + "''{1}''.<br>"
                         + "This conflict cannot be added.</html>",
-                        getLayer().getName(),
-                        conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
+                        Utils.escapeReservedCharactersHTML(getLayer().getName()),
+                        Utils.escapeReservedCharactersHTML(conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()))
                 ),
                 tr("Double conflict"),