Ensure output buffer big enough for DSN additions to MAIL FROM. Bug 1482

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 0fa4ccd4846c8ee722b39822cbdded3f6eeaf215..b6ff5110815ffa67b26855d790bc0e649c355a29 100644 (file)
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -352,6 +352,10 @@ if (!string_vformat(big_buffer, big_buffer_size, CS format, ap))
 va_end(ap);
 count = Ustrlen(big_buffer);
 
 va_end(ap);
 count = Ustrlen(big_buffer);
 

+if (count > outblock->buffersize)
+  log_write(0, LOG_MAIN|LOG_PANIC_DIE, "overlong write_command in outgoing "
+    "SMTP");
+

 if (count > outblock->buffersize - (outblock->ptr - outblock->buffer))
   {
   rc = outblock->cmd_count;                 /* flush resets */
 if (count > outblock->buffersize - (outblock->ptr - outblock->buffer))
   {
   rc = outblock->cmd_count;                 /* flush resets */

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 33c91a67ab055d28098580c46ad83c38cb455aa4..40eebe8b68c9bad080dff10f6e54322dfb12cd67 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1228,7 +1228,7 @@ uschar new_message_id[MESSAGE_ID_LENGTH + 1];
 uschar *p;
 uschar buffer[4096];
 uschar inbuffer[4096];
 uschar *p;
 uschar buffer[4096];
 uschar inbuffer[4096];

-uschar outbuffer[1024];
+uschar outbuffer[4096];

 
 suppress_tls = suppress_tls;  /* stop compiler warning when no TLS support */
 
 
 suppress_tls = suppress_tls;  /* stop compiler warning when no TLS support */