[PATCH] Don't open a XML tag while another one is already open
From: Robert Schiele <hidden>
Date: 2016-06-15 22:44:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
chop_and_escape_str calls esc_html within a XML tag. Since esc_html itself does escape control characters with quot_cec it could potentially open another tag which leads to incorrect XML. This patch adds an option "intag" to esc_html and quot_cec to indicate that we are currently within a tag and thus suppresses opening another one. It also makes use of this option in chop_and_escape_str. Signed-off-by: Robert Schiele <redacted> --- This patch should fix the bug Martin Koegler reported in his mail "Invalid html output repo.or.cz (alt-git.git)". gitweb/gitweb.perl | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 5e88637..a010c7a 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl@@ -732,7 +732,7 @@ sub esc_html ($;%) { if ($opts{'-nbsp'}) { $str =~ s/ / /g; } - $str =~ s|([[:cntrl:]])|(($1 ne "\t") ? quot_cec($1) : $1)|eg; + $str =~ s|([[:cntrl:]])|(($1 ne "\t") ? quot_cec($1, -intag=>$opts{'-intag'}) : $1)|eg; return $str; }
@@ -753,6 +753,7 @@ sub esc_path { # Make control characters "printable", using character escape codes (CEC) sub quot_cec { my $cntrl = shift; + my %opts = @_; my %es = ( # character escape codes, aka escape sequences "\t" => '\t', # tab (HT) "\n" => '\n', # line feed (LF)
@@ -767,7 +768,11 @@ sub quot_cec { my $chr = ( (exists $es{$cntrl}) ? $es{$cntrl} : sprintf('\%03o', ord($cntrl)) ); - return "<span class=\"cntrl\">$chr</span>"; + if ($opts{'-intag'}) { + return "$chr"; + } else { + return "<span class=\"cntrl\">$chr</span>"; + } } # Alternatively use unicode control pictures codepoints,
@@ -866,7 +871,7 @@ sub chop_and_escape_str { if ($chopped eq $str) { return esc_html($chopped); } else { - return qq{<span title="} . esc_html($str) . qq{">} . + return qq{<span title="} . esc_html($str, -intag=>1) . qq{">} . esc_html($chopped) . qq{</span>}; } }
--
1.5.2.4