From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 26 Feb 2015 19:58:13 +0000 (+0000)
Subject: Increase limit on SMTP confirmation message copy size.  Bug 1572
X-Git-Tag: exim-4_86_RC1~106
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=b980ed83fa4ae95ee650ccf73d33dbad4c20c595

Increase limit on SMTP confirmation message copy size.  Bug 1572
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b027a6611..55af3186c 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -78,6 +78,9 @@ JH/21 Support for the A6 type of dns record is withdrawn.
 JH/22 Bug 608: The result of a QUIT or not-QUIT toplevel ACL now matters
       rather than the verbs used.
 
+JH/23 Bug 1572: Increase limit on SMTP confirmation message copy size
+      from 255 to 1024 chars.
+
 
 
 Exim version 4.85
diff --git a/src/src/deliver.c b/src/src/deliver.c
index ec13ca40b..ad871c575 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -911,11 +911,12 @@ if (log_extra_selector & LX_smtp_confirmation &&
     addr->message &&
     (addr->host_used || Ustrcmp(addr->transport->driver_name, "lmtp") == 0))
   {
-  int i;
+  unsigned i;
+  unsigned lim = MIN(big_buffer_size, 1024);
   uschar *p = big_buffer;
   uschar *ss = addr->message;
   *p++ = '\"';
-  for (i = 0; i < 256 && ss[i] != 0; i++)	/* limit logged amount */
+  for (i = 0; i < lim && ss[i] != 0; i++)	/* limit logged amount */
     {
     if (ss[i] == '\"' || ss[i] == '\\') *p++ = '\\'; /* quote \ and " */
     *p++ = ss[i];