[SACVS] CVS: spamassassin/lib/Mail/SpamAssassin Util.pm,1.34,1.35

Update of /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin
In directory sc8-pr-cvs1:/tmp/cvs-serv18054/lib/Mail/SpamAssassin

Modified Files:
        Util.pm 
Log Message:
bug 2466: spamd 2.6rc5 broken under FreeBSD 4.8-STABLE with Perl 5.005


Index: Util.pm
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin/Util.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -b -w -u -d -r1.34 -r1.35
--- Util.pm     15 Sep 2003 23:02:04 -0000      1.34
+++ Util.pm     16 Sep 2003 23:04:25 -0000      1.35
@@ -198,8 +198,12 @@
     return @{$_} if wantarray;
   }
   elsif (ref eq 'HASH') {
-    foreach my $k (keys %{$_}) {
-      ${$_}{untaint_var($k)} = untaint_var(${$_}{$k});
+    while (my ($k, $v) = each %{$_}) {
+      if (!defined $v && $_ == \%ENV) {
+       delete ${$_}{$k};
+       next;
+      }
+      ${$_}{untaint_var($k)} = untaint_var($v);
     }
     return %{$_} if wantarray;
   }



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf