microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

gitweb: Protect escaping functions against calling on undef 

This is a bit of future-proofing esc_html and friends: when called
with undefined value they would now would return undef... which would
probably mean that error would still occur, but closer to the source
of problem.

This means that we can safely use
  esc_html(shift) || "Internal Server Error"
in die_error() instead of
  esc_html(shift || "Internal Server Error")

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jakub Narebski 2010-02-07 21:52:25 +01:00 коммит произвёл Junio C Hamano
Родитель 453541fcfc
Коммит 1df4876613
1 изменённых файлов: 8 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
gitweb/gitweb.perl
Просмотреть файл

@ -1143,6 +1143,7 @@ sub validate_refname {
# in utf-8 thanks to "binmode STDOUT, ':utf8'" at beginning # in utf-8 thanks to "binmode STDOUT, ':utf8'" at beginning
sub to_utf8 { sub to_utf8 {
my $str = shift; my $str = shift;
return undef unless defined $str;
if (utf8::valid($str)) { if (utf8::valid($str)) {
utf8::decode($str); utf8::decode($str);
return $str; return $str;
@ -1155,6 +1156,7 @@ sub to_utf8 {
# correct, but quoted slashes look too horrible in bookmarks # correct, but quoted slashes look too horrible in bookmarks
sub esc_param { sub esc_param {
my $str = shift; my $str = shift;
return undef unless defined $str;
$str =~ s/([^A-Za-z0-9\-_.~()\/:@ ]+)/CGI::escape($1)/eg; $str =~ s/([^A-Za-z0-9\-_.~()\/:@ ]+)/CGI::escape($1)/eg;
$str =~ s/ /\+/g; $str =~ s/ /\+/g;
return $str; return $str;
@ -1163,6 +1165,7 @@ sub esc_param {
# quote unsafe chars in whole URL, so some charactrs cannot be quoted # quote unsafe chars in whole URL, so some charactrs cannot be quoted
sub esc_url { sub esc_url {
my $str = shift; my $str = shift;
return undef unless defined $str;
$str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg; $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
$str =~ s/\+/%2B/g; $str =~ s/\+/%2B/g;
$str =~ s/ /\+/g; $str =~ s/ /\+/g;
@ -1174,6 +1177,8 @@ sub esc_html {
my $str = shift; my $str = shift;
my %opts = @_; my %opts = @_;
return undef unless defined $str;
$str = to_utf8($str); $str = to_utf8($str);
$str = $cgi->escapeHTML($str); $str = $cgi->escapeHTML($str);
if ($opts{'-nbsp'}) { if ($opts{'-nbsp'}) {
@ -1188,6 +1193,8 @@ sub esc_path {
my $str = shift; my $str = shift;
my %opts = @_; my %opts = @_;
return undef unless defined $str;
$str = to_utf8($str); $str = to_utf8($str);
$str = $cgi->escapeHTML($str); $str = $cgi->escapeHTML($str);
if ($opts{'-nbsp'}) { if ($opts{'-nbsp'}) {
@ -3387,7 +3394,7 @@ sub git_footer_html {
# or down for maintenance). Generally, this is a temporary state. # or down for maintenance). Generally, this is a temporary state.
sub die_error { sub die_error {
my $status = shift || 500; my $status = shift || 500;
my $error = esc_html(shift || "Internal Server Error"); my $error = esc_html(shift) || "Internal Server Error";
my $extra = shift; my $extra = shift;
my %http_responses = ( my %http_responses = (