diff options
| author | dmitry <none@none> | 2013-10-10 12:00:10 +0300 |
|---|---|---|
| committer | dmitry <none@none> | 2013-10-10 12:00:10 +0300 |
| commit | ea14f690e2d5b567ecfdf1094f69b78b522efd51 (patch) | |
| tree | fda1d70c817762e6f48ff23a9cdd98babd386c43 /indra/llui | |
| parent | d71e3f950cf84f67360e1ac7552c01c18eeb6d09 (diff) | |
MAINT-535 Wiki-style link markup hides potentially malicious secondlife: app URLs
Partial fix: disabled URLs in the 'label' part of Wiki-style link
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llurlentry.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index b1cc502c4b..840f67968d 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -1067,7 +1067,8 @@ LLUrlEntrySLLabel::LLUrlEntrySLLabel() std::string LLUrlEntrySLLabel::getLabel(const std::string &url, const LLUrlLabelCallback &cb) { - return getLabelFromWikiLink(url); + std::string label = getLabelFromWikiLink(url); + return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url); } std::string LLUrlEntrySLLabel::getUrl(const std::string &string) const |