gitweb: pass string after encoding in utf-8 to syntax highlighter

zzs213 · gitster · commit 927cd1fc940f · 2011-08-04T12:13:38.000-07:00
Otherwise the highlight filter would work on a corrupt byte sequence.

Signed-off-by: 张忠山 &lt;zzs213@126.com&gt;
Acked-by: Jakub Narebski &lt;jnareb@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -6465,7 +6465,7 @@ 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 ? $line : esc_html($line, -nbsp=>1);
+			       $nr, esc_attr(href(-replay => 1)), $nr, $nr, $syntax ? to_utf8($line) : esc_html($line, -nbsp=>1);
 		}
 	}
 	close $fd

Original file line number	Diff line number	Diff line change
`@@ -6465,7 +6465,7 @@ sub git_blob {`
`6465`	`6465`	`$nr++;`
`6466`	`6466`	`$line = untabify($line);`
`6467`	`6467`	`printf qq!<div class="pre"><a id="l%i" href="%s#l%i" class="linenr">%4i</a> %s</div>\n!,`
`6468`		`- $nr, esc_attr(href(-replay => 1)), $nr, $nr, $syntax ? $line : esc_html($line, -nbsp=>1);`
	`6468`	`+ $nr, esc_attr(href(-replay => 1)), $nr, $nr, $syntax ? to_utf8($line) : esc_html($line, -nbsp=>1);`
`6469`	`6469`	`}`
`6470`	`6470`	`}`
`6471`	`6471`	`close $fd`