You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2005/06/15 08:14:20 UTC

svn commit: r190712 - /spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm

Author: jm
Date: Tue Jun 14 23:14:19 2005
New Revision: 190712

URL: http://svn.apache.org/viewcvs?rev=190712&view=rev
Log:
bug 4370: ensure we exit if an exec fails, as die may be trapped by an eval statement

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=190712&r1=190711&r2=190712&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Tue Jun 14 23:14:19 2005
@@ -1267,8 +1267,12 @@
   }
 
   exec @cmdline;
-  die "util: exec failed: $!";  
-  # must be a die() otherwise -w will complain
+  warn "util: exec failed: $!";
+
+  # bug 4370: we really have to exit here; break any eval traps
+  POSIX::_exit(1);  # avoid END and destructor processing 
+  kill('KILL',$$);  # still kicking? die! 
+  die;  # must be a die() otherwise -w will complain
 }
 
 ###########################################################################