X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/ce84d65e52cc3801b902b4e3c6f04d68aae733fe1140d39c8ccb68f3a4ebca48..aff2acf1437fb10d6b390b236146736c4e8044d3cc1f34506ea2b4b4a82df65d:/gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 9ab1f17..9af69af 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -68,16 +68,17 @@ our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
 
 $projects_list ||= $projectroot;
 if (! -d $git_temp) {
-	mkdir($git_temp, 0700) || die_error("Couldn't mkdir $git_temp");
+	mkdir($git_temp, 0700) || die_error(undef, "Couldn't mkdir $git_temp");
 }
 
+# ======================================================================
 # input validation and dispatch
 our $action = $cgi->param('a');
 if (defined $action) {
 	if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
-		undef $action;
 		die_error(undef, "Invalid action parameter.");
 	}
+	# action which does not check rest of parameters
 	if ($action eq "opml") {
 		git_opml();
 		exit;
@@ -87,16 +88,13 @@ if (defined $action) {
 our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
 if (defined $project) {
 	$project =~ s|^/||; $project =~ s|/$||;
-	$project = validate_input($project);
-	if (!defined($project)) {
+	if (!validate_input($project)) {
 		die_error(undef, "Invalid project parameter.");
 	}
 	if (!(-d "$projectroot/$project")) {
-		undef $project;
 		die_error(undef, "No such directory.");
 	}
 	if (!(-e "$projectroot/$project/HEAD")) {
-		undef $project;
 		die_error(undef, "No such project.");
 	}
 	$rss_link = "<link rel=\"alternate\" title=\"" . esc_param($project) . " log\" href=\"" .
@@ -109,32 +107,28 @@ if (defined $project) {
 
 our $file_name = $cgi->param('f');
 if (defined $file_name) {
-	$file_name = validate_input($file_name);
-	if (!defined($file_name)) {
+	if (!validate_input($file_name)) {
 		die_error(undef, "Invalid file parameter.");
 	}
 }
 
 our $hash = $cgi->param('h');
 if (defined $hash) {
-	$hash = validate_input($hash);
-	if (!defined($hash)) {
+	if (!validate_input($hash)) {
 		die_error(undef, "Invalid hash parameter.");
 	}
 }
 
 our $hash_parent = $cgi->param('hp');
 if (defined $hash_parent) {
-	$hash_parent = validate_input($hash_parent);
-	if (!defined($hash_parent)) {
+	if (!validate_input($hash_parent)) {
 		die_error(undef, "Invalid hash parent parameter.");
 	}
 }
 
 our $hash_base = $cgi->param('hb');
 if (defined $hash_base) {
-	$hash_base = validate_input($hash_base);
-	if (!defined($hash_base)) {
+	if (!validate_input($hash_base)) {
 		die_error(undef, "Invalid hash base parameter.");
 	}
 }
@@ -142,7 +136,6 @@ if (defined $hash_base) {
 our $page = $cgi->param('pg');
 if (defined $page) {
 	if ($page =~ m/[^0-9]$/) {
-		undef $page;
 		die_error(undef, "Invalid page parameter.");
 	}
 }
@@ -150,7 +143,6 @@ if (defined $page) {
 our $searchtext = $cgi->param('s');
 if (defined $searchtext) {
 	if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
-		undef $searchtext;
 		die_error(undef, "Invalid search parameter.");
 	}
 	$searchtext = quotemeta $searchtext;
@@ -180,7 +172,6 @@ my %actions = (
 
 $action = 'summary' if (!defined($action));
 if (!defined($actions{$action})) {
-	undef $action;
 	die_error(undef, "Unknown action.");
 }
 $actions{$action}->();
@@ -1656,7 +1647,7 @@ sub git_blob_plain {
 	}
 	my $type = shift;
 	open my $fd, "-|", $GIT, "cat-file", "blob", $hash
-		or die_error("Couldn't cat $file_name, $hash");
+		or die_error(undef, "Couldn't cat $file_name, $hash");
 
 	$type ||= git_blob_plain_mimetype($fd, $file_name);
 
@@ -2321,7 +2312,7 @@ sub git_history {
 
 sub git_search {
 	if (!defined $searchtext) {
-		die_error("", "Text field empty.");
+		die_error(undef, "Text field empty.");
 	}
 	if (!defined $hash) {
 		$hash = git_read_head($project);