svn commit: r1825031 - /spamassassin/trunk/spamd/spamd.raw

[gb...@apache.org]

Author: gbechis
Date: Thu Feb 22 08:17:30 2018
New Revision: 1825031

URL: http://svn.apache.org/viewvc?rev=1825031&view=rev
Log:
Check if $socket is defined and print error accordingly
bz 7380

Modified:
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=1825031&r1=1825030&r2=1825031&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Thu Feb 22 08:17:30 2018
@@ -1559,10 +1559,16 @@ sub accept_from_any_server_socket {
     flock($sockets_access_lock_fh, LOCK_UN)
       or die "Can't release sockets-access lock: $!";
   }
-  $client or die sprintf("accept_a_conn: %s accept failed: %s",
+  if(!defined $client) {
+    if(defined($socket)) {
+      die sprintf("accept_a_conn: %s accept failed: %s",
                          ref $socket,
                          !$socket->isa('IO::Socket::SSL') ? $!
                            : $socket->errstr.", $!");
+    } else {
+      die sprintf("accept_a_conn: no socket available");
+    }
+  }
   return ($client, $selected_socket_info);
 }