You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2011/09/14 11:50:43 UTC

svn commit: r1170502 - /spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm

Author: mmartinec
Date: Wed Sep 14 09:50:43 2011
New Revision: 1170502

URL: http://svn.apache.org/viewvc?rev=1170502&view=rev
Log:
Bug 6642: just in case - as a precaution against CPAN-RT#56826 memory corruption bug in Sys-Syslog older than 0.28

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm?rev=1170502&r1=1170501&r2=1170502&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm Wed Sep 14 09:50:43 2011
@@ -39,7 +39,7 @@ use Time::HiRes ();
 use Sys::Syslog qw(:DEFAULT setlogsock);
 use Mail::SpamAssassin::Logger;
 
-use vars qw(@ISA %prio_map);
+use vars qw(@ISA %prio_map $syslog_open);
 @ISA = ();
 
 BEGIN {
@@ -50,6 +50,10 @@ BEGIN {
                notice => 'notice', warn => 'warning', warning => 'warning',
                error => 'err', err => 'err', crit => 'crit', alert => 'alert',
                emerg => 'emerg');
+
+  # make sure never to hit the CPAN-RT#56826 bug (memory corruption
+  # when closelog() is called twice), fixed in Sys-Syslog 0.28
+  $syslog_open = 0;
 }
 
 sub new {
@@ -64,6 +68,7 @@ sub new {
   $self->{disabled} = 0;
   $self->{consecutive_failures} = 0;
   $self->{failure_threshold} = 10;
+  $self->{SIGPIPE_RECEIVED} = 0;
 
   # parameters
   my %params = @_;
@@ -97,6 +102,7 @@ sub init {
     dbg("logger: opening syslog with $log_socket socket");
     # the next call is required to actually open the socket
     openlog($self->{ident}, 'cons,pid,ndelay', $self->{log_facility});
+    $syslog_open = 1;
     1;
   } or do {
     $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
@@ -115,6 +121,7 @@ sub init {
       setlogsock('inet') or die "setlogsock('inet') failed: $!";
       dbg("logger: opening syslog using inet socket");
       openlog($self->{ident}, 'cons,pid,ndelay', $self->{log_facility});
+      $syslog_open = 1;
       1;
     } or do {
       $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
@@ -149,7 +156,8 @@ sub log_message {
   local $SIG{'PIPE'} = sub {
     $self->{SIGPIPE_RECEIVED}++;
     # force a log-close.   trap possible die() calls
-    eval { closelog(); };
+    eval { closelog() } if $syslog_open;
+    $syslog_open = 0;
   };
 
   my $timestamp = '';
@@ -204,8 +212,10 @@ sub check_syslog_sigpipe {
   eval {
     # SIGPIPE received when writing to syslog -- close and reopen
     # the log handle, then try again.
-    closelog();
+    closelog() if $syslog_open;
+    $syslog_open = 0;
     openlog($self->{ident}, 'cons,pid,ndelay', $self->{log_facility});
+    $syslog_open = 1;
     syslog('debug', "%s", "syslog reopened");
     syslog('info', "%s", $msg);
 
@@ -215,7 +225,7 @@ sub check_syslog_sigpipe {
     syslog('info', "%s", $msg);
 
     # if we've received multiple sigpipes, logging is probably still broken.
-    if ($self->{SIGPIPE_RECEIVED} > 1) {
+    if ($self->{SIGPIPE_RECEIVED}) {
       warn "logger: syslog failure: multiple SIGPIPEs received\n";
       $self->{disabled} = 1;
     }
@@ -246,7 +256,8 @@ sub syslog_incr_failure_counter {
 sub close_log {
   my ($self) = @_;
 
-  closelog();
+  closelog() if $syslog_open;
+  $syslog_open = 0;
 }
 
 1;