Escape project name in regexp

madduck · gitster · commit bbd4c307fc31 · 2008-04-21T23:30:11.000-07:00
The project name, when used in a regular expression, needs to be quoted properly, so that stuff like '++' in the project name does not cause Perl to barf. Related info: http://bugs.debian.org/476076 This is a bug in Perl's CGI.pm, but fixing that exposed a similar bug in gitweb.perl Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -506,7 +506,7 @@ sub evaluate_path_info {
 	}
 	# do not change any parameters if an action is given using the query string
 	return if $action;
-	$path_info =~ s,^$project/*,,;
+	$path_info =~ s,^\Q$project\E/*,,;
 	my ($refname, $pathname) = split(/:/, $path_info, 2);
 	if (defined $pathname) {
 		# we got "project.git/branch:filename" or "project.git/branch:dir/"

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ sub evaluate_path_info {`
`506`	`506`	`}`
`507`	`507`	`# do not change any parameters if an action is given using the query string`
`508`	`508`	`return if $action;`
`509`		`- $path_info =~ s,^$project/*,,;`
	`509`	`+ $path_info =~ s,^\Q$project\E/*,,;`
`510`	`510`	`my ($refname, $pathname) = split(/:/, $path_info, 2);`
`511`	`511`	`if (defined $pathname) {`
`512`	`512`	`# we got "project.git/branch:filename" or "project.git/branch:dir/"`