Merge branch dane-tpda into dane

[exim.git] / src / src / spam.c

diff --git a/src/src/spam.c b/src/src/spam.c
index 55999a3971b27b162263769637c76b78c741bdc5..7eb6fbfa75ceed0cf15d38f5ea5019525ddd733e 100644 (file)
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/src/spam.c,v 1.18 2010/06/05 11:13:30 pdp Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
@@ -22,14 +20,16 @@ int spam_ok = 0;
 int spam_rc = 0;
 uschar *prev_spamd_address_work = NULL;
 
-int spam(uschar **listptr) {
+int
+spam(uschar **listptr)
+{
   int sep = 0;
   uschar *list = *listptr;
   uschar *user_name;
   uschar user_name_buffer[128];
   unsigned long mbox_size;
   FILE *mbox_file;
-  int spamd_sock;
+  int spamd_sock = -1;
   uschar spamd_buffer[32600];
   int i, j, offset, result;
   uschar spamd_version[8];
@@ -150,6 +150,7 @@ int spam(uschar **listptr) {
     };
 
     while ( num_servers > 0 ) {
+      int i;
 
       /* Randomly pick a server to try */
       current_server = random_number( num_servers );
@@ -185,7 +186,6 @@ int spam(uschar **listptr) {
 
       /* Remove the server from the list. XXX We should free the memory */
       num_servers--;
-      int i;
       for( i = current_server; i < num_servers; i++ )
         spamd_address_vector[i] = spamd_address_vector[i+1];
     }
@@ -222,6 +222,14 @@ int spam(uschar **listptr) {
 
   }
 
+  if (spamd_sock == -1) {
+    log_write(0, LOG_MAIN|LOG_PANIC,
+        "programming fault, spamd_sock unexpectedly unset");
+    (void)fclose(mbox_file);
+    (void)close(spamd_sock);
+    return DEFER;
+  }
+
   /* now we are connected to spamd on spamd_sock */
   (void)string_format(spamd_buffer,
            sizeof(spamd_buffer),
@@ -280,7 +288,7 @@ again:
             "spam acl condition: %s on spamd socket", strerror(errno));
         else {
           if (time(NULL) - start < SPAMD_TIMEOUT)
-          goto again;
+            goto again;
           log_write(0, LOG_MAIN|LOG_PANIC,
             "spam acl condition: timed out writing spamd socket");
         }