From: joey Date: Tue, 21 Aug 2007 16:47:01 +0000 (+0000) Subject: fix libdir tainting X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/9ff9ea55f70a455a96fad3d34266343327528723 fix libdir tainting --- diff --git a/IkiWiki.pm b/IkiWiki.pm index 5eef40878..b70f51175 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -146,7 +146,7 @@ sub checkconfig () { #{{{ sub loadplugins () { #{{{ if (defined $config{libdir}) { - unshift @INC, $config{libdir}; + unshift @INC, possibly_foolish_untaint($config{libdir}); } loadplugin($_) foreach @{$config{plugin}}; @@ -166,7 +166,8 @@ sub loadplugin ($) { #{{{ return if grep { $_ eq $plugin} @{$config{disable_plugins}}; - foreach my $dir ($config{libdir}, "$installdir/lib/ikiwiki") { + foreach my $dir (possibly_foolish_untaint($config{libdir}), + "$installdir/lib/ikiwiki") { if (defined $dir && -x "$dir/plugins/$plugin") { require IkiWiki::Plugin::external; import IkiWiki::Plugin::external "$dir/plugins/$plugin";