summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2012-05-03 19:18:34 -0700
committerPhil Pennock <pdp@exim.org>2012-05-03 19:18:34 -0700
commit0f5014860e54132a13e4ecc2f7f1859a9f3a971b (patch)
tree6ab5db805da0a2eabe724cfdf7d2351edca28328 /src
parentda3ad30dcfbb4770835c2b7e165bb719f76cfc16 (diff)
spurious compiler warning of unused var fix
(but added check in case wrong about spuriousness)
Diffstat (limited to 'src')
-rw-r--r--src/src/spam.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/src/spam.c b/src/src/spam.c
index 0597084de..63395f2d5 100644
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -27,7 +27,7 @@ int spam(uschar **listptr) {
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];
@@ -220,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),