From 0f5014860e54132a13e4ecc2f7f1859a9f3a971b Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Thu, 3 May 2012 19:18:34 -0700 Subject: [PATCH 1/1] spurious compiler warning of unused var fix (but added check in case wrong about spuriousness) --- src/src/spam.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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), -- 2.30.2