gitweb: Fix two 'uninitialized value' warnings in git_tree()

jnareb · spearce · commit 2d7a3532c78b · 2008-10-02T17:43:18.000-07:00
If we did try to access nonexistent directory or file, which means
that git_get_hash_by_path() returns `undef`, uninitialized $hash
variable was passed to 'open' call.  Now we fail early with "404 Not
Found - No such tree" error.  (If we try to access something which
does not resolve to tree-ish, for example a file / 'blob' object, the
error will be caught later, as "404 Not Found - Reading tree failed"
error).

If we tried to use 'tree' action without $file_name ('f' parameter)
set, which means either tree given by hash or a top tree (and we
currently cannot distinguish between those two cases), we cannot print
path breadcrumbs with git_print_page_path().  Fix this by moving call
to git_print_page_path() inside conditional.

Signed-off-by: Jakub Narebski &lt;jnareb@gmail.com&gt;
Acked-by: Petr Baudis &lt;pasky@suse.cz&gt;
Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -4421,6 +4421,7 @@ sub git_tree {
 			$hash = $hash_base;
 		}
 	}
+	die_error(404, "No such tree") unless defined($hash);
 	$/ = "\0";
 	open my $fd, "-|", git_cmd(), "ls-tree", '-z', $hash
 		or die_error(500, "Open git-ls-tree failed");
@@ -4461,8 +4462,8 @@ sub git_tree {
 		if ($basedir ne '' && substr($basedir, -1) ne '/') {
 			$basedir .= '/';
 		}
+		git_print_page_path($file_name, 'tree', $hash_base);
 	}
-	git_print_page_path($file_name, 'tree', $hash_base);
 	print "<div class=\"page_body\">\n";
 	print "<table class=\"tree\">\n";
 	my $alternate = 1;

Original file line number	Diff line number	Diff line change
`@@ -4421,6 +4421,7 @@ sub git_tree {`
`4421`	`4421`	`$hash = $hash_base;`
`4422`	`4422`	`}`
`4423`	`4423`	`}`
	`4424`	`+ die_error(404, "No such tree") unless defined($hash);`
`4424`	`4425`	`$/ = "\0";`
`4425`	`4426`	`open my $fd, "-\|", git_cmd(), "ls-tree", '-z', $hash`
`4426`	`4427`	`or die_error(500, "Open git-ls-tree failed");`
`@@ -4461,8 +4462,8 @@ sub git_tree {`
`4461`	`4462`	`if ($basedir ne '' && substr($basedir, -1) ne '/') {`
`4462`	`4463`	`$basedir .= '/';`
`4463`	`4464`	`}`
	`4465`	`+ git_print_page_path($file_name, 'tree', $hash_base);`
`4464`	`4466`	`}`
`4465`		`- git_print_page_path($file_name, 'tree', $hash_base);`
`4466`	`4467`	`print "<div class=\"page_body\">\n";`
`4467`	`4468`	`print "<table class=\"tree\">\n";`
`4468`	`4469`	`my $alternate = 1;`