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

gitweb: Don't undefine query parameter related variables before die_error 

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jakub Narebski 2006-08-05 12:58:06 +02:00 коммит произвёл Junio C Hamano
Родитель 623e4aeb42
Коммит dbd954a896
1 изменённых файлов: 5 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -76,7 +76,6 @@ if (! -d $git_temp) {
our $action = $cgi->param('a'); our $action = $cgi->param('a');
if (defined $action) { if (defined $action) {
if ($action =~ m/[^0-9a-zA-Z\.\-_]/) { if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
undef $action;
die_error(undef, "Invalid action parameter."); die_error(undef, "Invalid action parameter.");
} }
# action which does not check rest of parameters # action which does not check rest of parameters
@ -89,16 +88,13 @@ if (defined $action) {
our $project = ($cgi->param('p') || $ENV{'PATH_INFO'}); our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
if (defined $project) { if (defined $project) {
$project =~ s|^/||; $project =~ s|/$||; $project =~ s|^/||; $project =~ s|/$||;
$project = validate_input($project); if (!validate_input($project)) {
if (!defined($project)) {
die_error(undef, "Invalid project parameter."); die_error(undef, "Invalid project parameter.");
} }
if (!(-d "$projectroot/$project")) { if (!(-d "$projectroot/$project")) {
undef $project;
die_error(undef, "No such directory."); die_error(undef, "No such directory.");
} }
if (!(-e "$projectroot/$project/HEAD")) { if (!(-e "$projectroot/$project/HEAD")) {
undef $project;
die_error(undef, "No such project."); die_error(undef, "No such project.");
} }
$rss_link = "<link rel=\"alternate\" title=\"" . esc_param($project) . " log\" href=\"" . $rss_link = "<link rel=\"alternate\" title=\"" . esc_param($project) . " log\" href=\"" .
@ -111,32 +107,28 @@ if (defined $project) {
our $file_name = $cgi->param('f'); our $file_name = $cgi->param('f');
if (defined $file_name) { if (defined $file_name) {
$file_name = validate_input($file_name); if (!validate_input($file_name)) {
if (!defined($file_name)) {
die_error(undef, "Invalid file parameter."); die_error(undef, "Invalid file parameter.");
} }
} }
our $hash = $cgi->param('h'); our $hash = $cgi->param('h');
if (defined $hash) { if (defined $hash) {
$hash = validate_input($hash); if (!validate_input($hash)) {
if (!defined($hash)) {
die_error(undef, "Invalid hash parameter."); die_error(undef, "Invalid hash parameter.");
} }
} }
our $hash_parent = $cgi->param('hp'); our $hash_parent = $cgi->param('hp');
if (defined $hash_parent) { if (defined $hash_parent) {
$hash_parent = validate_input($hash_parent); if (!validate_input($hash_parent)) {
if (!defined($hash_parent)) {
die_error(undef, "Invalid hash parent parameter."); die_error(undef, "Invalid hash parent parameter.");
} }
} }
our $hash_base = $cgi->param('hb'); our $hash_base = $cgi->param('hb');
if (defined $hash_base) { if (defined $hash_base) {
$hash_base = validate_input($hash_base); if (!validate_input($hash_base)) {
if (!defined($hash_base)) {
die_error(undef, "Invalid hash base parameter."); die_error(undef, "Invalid hash base parameter.");
} }
} }
@ -144,7 +136,6 @@ if (defined $hash_base) {
our $page = $cgi->param('pg'); our $page = $cgi->param('pg');
if (defined $page) { if (defined $page) {
if ($page =~ m/[^0-9]$/) { if ($page =~ m/[^0-9]$/) {
undef $page;
die_error(undef, "Invalid page parameter."); die_error(undef, "Invalid page parameter.");
} }
} }
@ -152,7 +143,6 @@ if (defined $page) {
our $searchtext = $cgi->param('s'); our $searchtext = $cgi->param('s');
if (defined $searchtext) { if (defined $searchtext) {
if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) { if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
undef $searchtext;
die_error(undef, "Invalid search parameter."); die_error(undef, "Invalid search parameter.");
} }
$searchtext = quotemeta $searchtext; $searchtext = quotemeta $searchtext;
@ -182,7 +172,6 @@ my %actions = (
$action = 'summary' if (!defined($action)); $action = 'summary' if (!defined($action));
if (!defined($actions{$action})) { if (!defined($actions{$action})) {
undef $action;
die_error(undef, "Unknown action."); die_error(undef, "Unknown action.");
} }
$actions{$action}->(); $actions{$action}->();