You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/08/08 07:28:26 UTC
svn commit: r1864685 -
/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
Author: hege
Date: Thu Aug 8 07:28:25 2019
New Revision: 1864685
URL: http://svn.apache.org/viewvc?rev=1864685&view=rev
Log:
TMPDIR fix from trunk
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm?rev=1864685&r1=1864684&r2=1864685&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm Thu Aug 8 07:28:25 2019
@@ -1196,7 +1196,8 @@ If it cannot open a file after 20 tries,
# thanks to http://www2.picante.com:81/~gtaylor/autobuse/ for this code
sub secure_tmpfile {
- my $tmpdir = untaint_file_path($ENV{'TMPDIR'} || File::Spec->tmpdir());
+ my $tmpenv = am_running_on_windows() ? 'TMP' : 'TMPDIR';
+ my $tmpdir = untaint_file_path($ENV{$tmpenv} || File::Spec->tmpdir());
defined $tmpdir && $tmpdir ne ''
or die "util: cannot find a temporary directory, set TMP or TMPDIR in environment";