git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spurious compiler warning of unused var fix
[exim.git]
/
src
/
src
/
spam.c
diff --git
a/src/src/spam.c
b/src/src/spam.c
index 55999a3971b27b162263769637c76b78c741bdc5..63395f2d54cc0521f5ff31954666dd3c0e3c2aa5 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 *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
@@
-29,7
+27,7
@@
int spam(uschar **listptr) {
uschar user_name_buffer[128];
unsigned long mbox_size;
FILE *mbox_file;
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];
uschar spamd_buffer[32600];
int i, j, offset, result;
uschar spamd_version[8];
@@
-150,6
+148,7
@@
int spam(uschar **listptr) {
};
while ( num_servers > 0 ) {
};
while ( num_servers > 0 ) {
+ int i;
/* Randomly pick a server to try */
current_server = random_number( num_servers );
/* Randomly pick a server to try */
current_server = random_number( num_servers );
@@
-185,7
+184,6
@@
int spam(uschar **listptr) {
/* Remove the server from the list. XXX We should free the memory */
num_servers--;
/* 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];
}
for( i = current_server; i < num_servers; i++ )
spamd_address_vector[i] = spamd_address_vector[i+1];
}
@@
-222,6
+220,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),
/* now we are connected to spamd on spamd_sock */
(void)string_format(spamd_buffer,
sizeof(spamd_buffer),