svn commit: rev 6238 - incubator/spamassassin/branches/b2_6_0

[fe...@apache.org]

Author: felicity
Date: Tue Jan 20 12:30:17 2004
New Revision: 6238

Modified:
   incubator/spamassassin/branches/b2_6_0/spamassassin.raw
Log:
bug 2857: using "spamassassin -l /path/to/file" failed because the -l wouldn't untaint the path.


Modified: incubator/spamassassin/branches/b2_6_0/spamassassin.raw
==============================================================================
--- incubator/spamassassin/branches/b2_6_0/spamassassin.raw	(original)
+++ incubator/spamassassin/branches/b2_6_0/spamassassin.raw	Tue Jan 20 12:30:17 2004
@@ -65,6 +65,7 @@
 eval {
   require Mail::SpamAssassin;
   require Mail::SpamAssassin::NoMailAudit;
+  require Mail::SpamAssassin::Util;
 
   # gnu_getopt is not available in Getopt::Long 2.24, see bug 732
   # gnu_compat neither.
@@ -107,6 +108,10 @@
   if (defined $opt{'version'}) {
     print "SpamAssassin version " . Mail::SpamAssassin::Version() . "\n";
     exit 0;
+  }
+
+  if ( defined $opt{'log-to-mbox'} ) {
+    $opt{'log-to-mbox'} = Mail::SpamAssassin::Util::untaint_file_path($opt{'log-to-mbox'});
   }
 
   my $doing_whitelist_operation = 0;