Ignore:
Timestamp:
2017-04-07T00:18:07+02:00 (2 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

    r10378 r11848  
    1717import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1818import org.openstreetmap.josm.tools.ImageProvider;
     19import org.openstreetmap.josm.tools.Utils;
    1920
    2021/**
     
    4142                        + "''{1}''.<br>"
    4243                        + "This conflict cannot be added.</html>",
    43                         getLayer().getName(),
    44                         conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
     44                        Utils.escapeReservedCharactersHTML(getLayer().getName()),
     45                        Utils.escapeReservedCharactersHTML(conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()))
    4546                ),
    4647                tr("Double conflict"),
Note: See TracChangeset for help on using the changeset viewer.