Changeset 11848 in josm for trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.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/actions/MergeLayerAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -130 +130 @@
                         "<b>This is not the recommended way of merging such data</b>.<br />"+
                         "You should instead check and merge each object, one by one, by using ''<i>Merge selection</i>''.<br /><br />"+
-                        "Are you sure you want to continue?", sourceLayer.getName(), targetLayer.getName(), targetLayer.getName())+
+                        "Are you sure you want to continue?",
+                        Utils.escapeReservedCharactersHTML(sourceLayer.getName()),
+                        Utils.escapeReservedCharactersHTML(targetLayer.getName()),
+                        Utils.escapeReservedCharactersHTML(targetLayer.getName()))+
                 "</html>",
                 ImageProvider.get("dialogs", "mergedown"), tr("Ignore this hint and merge anyway"));