diff options
author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-03-29 15:53:12 +0000 |
---|---|---|
committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-03-29 15:53:12 +0000 |
commit | f9b9210ed00d36e87538b5d4abe51c079826fb9c (patch) | |
tree | 9a29df1d8fcb75c8be76313d266b09e196076c54 /src | |
parent | d1d97a7641e06d3372f2ded9e5cb1e97b86d3c40 (diff) |
Fix non-check for read() error in sync check before writing banner.
Diffstat (limited to 'src')
-rw-r--r-- | src/src/smtp_in.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 7348e9b15..c10293c87 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/smtp_in.c,v 1.14 2005/03/22 10:11:43 ph10 Exp $ */ +/* $Cambridge: exim/src/src/smtp_in.c,v 1.15 2005/03/29 15:53:12 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -1616,14 +1616,17 @@ if (smtp_enforce_sync && sender_host_address != NULL && !sender_host_notsocket) &tzero) > 0) { int rc = read(fileno(smtp_in), smtp_inbuffer, in_buffer_size); - if (rc > 150) rc = 150; - smtp_inbuffer[rc] = 0; - log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol violation: " - "synchronization error (input sent without waiting for greeting): " - "rejected connection from %s input=\"%s\"", host_and_ident(TRUE), - string_printing(smtp_inbuffer)); - smtp_printf("554 SMTP synchronization error\r\n"); - return FALSE; + if (rc > 0) + { + if (rc > 150) rc = 150; + smtp_inbuffer[rc] = 0; + log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol violation: " + "synchronization error (input sent without waiting for greeting): " + "rejected connection from %s input=\"%s\"", host_and_ident(TRUE), + string_printing(smtp_inbuffer)); + smtp_printf("554 SMTP synchronization error\r\n"); + return FALSE; + } } } |