@matheusbsbs / matheus-bagliano / commits / f987afa8fe
Fork 0

cvsserver: Limit config parser to needed options

Change the configuration parser so that it ignores everything except for ^gitcvs.((ext|pserver).)? This greatly reduces the risk of failing while parsing some unknown and irrelevant config option. The bug that triggered this change was that the parsing doesn't handle sections that have a subsection and a variable with the same name. While this bug still remains, all remaining causes can be attributed to user error, since there are no defined variables gitcvs.ext and gitcvs.pserver. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>

Frank Lichtenheld committed May 13, 2007 at 02:16 UTC f987afa8fe13c2a1512094362b06172419977bc4
1 file changed +3 -3
git-cvsserver.perl
+3 -3
@@ -183,9 +183,9 @@ sub req_Root
183 }
184 foreach my $line ( @gitvars )
185 {
186 - next unless ( $line =~ /^(.*?)\.(.*?)(?:\.(.*?))?=(.*)$/ );
187 - unless ($3) {
188 - $cfg->{$1}{$2} = $4;
186 + next unless ( $line =~ /^(gitcvs)\.(?:(ext|pserver)\.)?([\w-]+)=(.*)$/ );
187 + unless ($2) {
188 + $cfg->{$1}{$3} = $4;
189 } else {
190 $cfg->{$1}{$2}{$3} = $4;
191 }