On Tue, 23 Aug 2011, Christopher M. Fuhrman wrote: > The current code, as is, passes control characters, such as form-feed > (^L) to highlight which then passes it through to the browser. This > will cause the browser to display one of the following warnings: > > Safari v5.1 (6534.50) & Google Chrome v13.0.782.112: > > This page contains the following errors: > > error on line 657 at column 38: PCDATA invalid Char value 12 > Below is a rendering of the page up to the first error. > > Mozilla Firefox 3.6.19 & Mozilla Firefox 5.0: > > XML Parsing Error: not well-formed > Location: > http://path/to/git/repo/blah/blah > > Both errors were generated by gitweb.perl v1.7.3.4 w/ highlight 2.7 > using arch/ia64/kernel/unwind.c from the Linux kernel. > > Strip non-printable control-characters by piping the output produced > by git-cat-file(1) to col(1) as follows: > > git cat-file blob deadbeef314159 | col -bx | highlight <args> > > Note usage of the '-x' option which tells col(1) to output multiple > spaces instead of tabs. Why use external program (which ming be not installed, or might not strip control-characters), instead of making gitweb sanitize highlighter output itself. Something like the patch below (which additionally shows where there are control characters): -- >8 -- diff --git i/gitweb/gitweb.perl w/gitweb/gitweb.perl index 7cf12af..192db2c 100755 --- i/gitweb/gitweb.perl +++ w/gitweb/gitweb.perl @@ -1517,6 +1517,17 @@ sub esc_path { return $str; } +# Sanitize for use in XHTML + application/xml+xhtml +sub sanitize { + my $str = shift; + + return undef unless defined $str; + + $str = to_utf8($str); + $str =~ s|([[:cntrl:]])|quot_cec($1)|eg; + return $str; +} + # Make control characters "printable", using character escape codes (CEC) sub quot_cec { my $cntrl = shift; @@ -6546,7 +6557,8 @@ sub git_blob { $nr++; $line = untabify($line); printf qq!<div class="pre"><a id="l%i" href="%s#l%i" class="linenr">%4i</a> %s</div>\n!, - $nr, esc_attr(href(-replay => 1)), $nr, $nr, $syntax ? to_utf8($line) : esc_html($line, -nbsp=>1); + $nr, esc_attr(href(-replay => 1)), $nr, $nr, + $syntax ? sanitize($line) : esc_html($line, -nbsp=>1); } } close $fd -- 8< -- -- Jakub Narebski Poland -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html