From: 张忠山 <redacted>
Date: Thu, 4 Aug 2011 15:52:55 +0000 (+0800)
Subject: gitweb: pass string after encoding in utf-8 to syntax highlighter
X-Git-Url: https://git.ladys.computer/Gitweb/commitdiff_plain/b37b5023b116309a4d9503fb80005e8472aff190b1dc1e04bb6d2ed483eac5b7

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

Otherwise the highlight filter would work on a corrupt byte sequence.

Signed-off-by: 张忠山 <redacted>
Acked-by: Jakub Narebski <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/gitweb.perl b/gitweb.perl
index 349c969..915f364 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -6485,7 +6485,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, 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