summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 11:55:30 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-10 11:55:30 -0700
commit1dc4aa67d615afa1f3fc0b19a873a68ba6ab3da8 (patch)
treebc3d1f02b40f38eb8c01d788013a5fd9bdc4f256
parent85b2ea29e83bc66a25cd44ddb1305ff2e6b985a8 (diff)
parent77947bbe24e0306d1ce5605c962c4a25f5aca22f (diff)
downloadgit-1dc4aa67d615afa1f3fc0b19a873a68ba6ab3da8.tar.gz
Merge branch 'ab/gitweb-link-html-escape' into maint
The characters in the label shown for tags/refs for commits in "gitweb" output are now properly escaped for proper HTML output. * ab/gitweb-link-html-escape: gitweb: escape link body in format_ref_marker
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 2fddf750fa..33d701d852 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2090,7 +2090,7 @@ sub format_ref_marker {
-href => href(
action=>$dest_action,
hash=>$dest
- )}, $name);
+ )}, esc_html($name));
$markers .= " <span class=\"".esc_attr($class)."\" title=\"".esc_attr($ref)."\">" .
$link . "</span>";