X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/63a92ba604e2784e0c64043f5ce505231e3efe80431e524bdc0df554969cf040..e0794c82b3b3769fd4c646ba0c7613f28b3983b5c45c016948b9b29c6dffc7f8:/gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 9956e59..c191482 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -3936,6 +3936,9 @@ sub run_highlighter {
 
 	close $fd;
 	open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
+	          quote_command($^X, '-CO', '-MEncode=decode,FB_DEFAULT', '-pse',
+	            '$_ = decode($fe, $_, FB_DEFAULT) if !utf8::decode($_);',
+	            '--', "-fe=$fallback_encoding")." | ".
 	          quote_command($highlight_bin).
 	          " --replace-tabs=8 --fragment --syntax $syntax |"
 		or die_error(500, "Couldn't open file or run syntax highlighter");
@@ -7577,7 +7580,7 @@ sub git_object {
 			git_cmd(), 'cat-file', '-t', $object_id) . ' 2> /dev/null'
 			or die_error(404, "Object does not exist");
 		$type = <$fd>;
-		chomp $type;
+		defined $type && chomp $type;
 		close $fd
 			or die_error(404, "Object does not exist");