Mailing List Archive

Author: sidney
Date: Wed Jun 15 22:23:22 2022
New Revision: 1901952

URL: http://svn.apache.org/viewvc?rev=1901952&view=rev
Log:
bug 8010 - Fix untaint pattern in File::Find in Windows

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=1901952&r1=1901951&r2=1901952&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Wed Jun 15 22:23:22 2022
@@ -2229,11 +2229,11 @@ sub _get_cf_pre_files_in_dir {

if ($self->{config_tree_recurse}) {
my @cfs;
-
# use "eval" to avoid loading File::Find unless this is specified
eval ' use File::Find qw();
File::Find::find(
{ untaint => 1,
+ am_running_on_windows() ? (untaint_pattern => qr|^([-+@\w.:\\/]+)$|) : (),
follow => 1,
wanted =>
sub { push(@cfs, $File::Find::name) if /\.\Q$type\E$/i && -f $_ }