summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2013-07-31 18:50:04 -0400
committerPhil Pennock <pdp@exim.org>2013-07-31 18:50:04 -0400
commitf4c1088bb7af23e4b613672230868056d46239a5 (patch)
tree5fa559bb92f491199022840e5c64f20dab4d9c8e /src
parent60f8e1e888f78e559e718c2e23c1ceb0546779a8 (diff)
Fix segfault in stdio with non-SMTP MIME ACL.
When injecting a message locally in non-SMTP mode, and with MIME ACLs configured, if the ACL rejected the message, Exim would try to `fprintf(NULL, "%s", the_message)`. This fixes that. Most ACLs are plumbed in SMTP-only and looking through the others in receive.c, they all appear to be safely guarded, so it was just this one that slipped through. Crash report and assistance tracking down the root cause from Warren Baker.
Diffstat (limited to 'src')
-rw-r--r--src/ACKNOWLEDGMENTS1
-rw-r--r--src/src/receive.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS
index 4474de322..0611b1f99 100644
--- a/src/ACKNOWLEDGMENTS
+++ b/src/ACKNOWLEDGMENTS
@@ -359,6 +359,7 @@ Simon Arlott Code for outbound SSL-on-connect
Patch fixing NUL term/init of DKIM strings
Patch fixing dnsdb TXT record handling for DKIM
Patch speeding up DomainKeys signing
+Warren Baker Found crash with MIME ACLs in non-SMTP local injection
Dmitry Banschikov Path to check for LDAP TLS initialisation errors
René Berber Pointed out mistake in build instructions for QNX
Johannes Berg Maintained dynamically loadable module code out-of-tree
diff --git a/src/src/receive.c b/src/src/receive.c
index 48c83db03..993d14917 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1277,9 +1277,10 @@ else if (rc != OK)
#ifdef EXPERIMENTAL_DCC
dcc_ok = 0;
#endif
- if (smtp_handle_acl_fail(ACL_WHERE_MIME, rc, user_msg, log_msg) != 0)
+ if (smtp_input && smtp_handle_acl_fail(ACL_WHERE_MIME, rc, user_msg, log_msg) != 0) {
*smtp_yield_ptr = FALSE; /* No more messsages after dropped connection */
- *smtp_reply_ptr = US""; /* Indicate reply already sent */
+ *smtp_reply_ptr = US""; /* Indicate reply already sent */
+ }
message_id[0] = 0; /* Indicate no message accepted */
return FALSE; /* Cause skip to end of receive function */
}