From: Simon Amor <simon@leaky.org>
Date: Mon, 6 Apr 2015 17:12:54 +0000 (+0100)
Subject: Care with printability of logged information.  Bug 1609
X-Git-Tag: exim-4_86_RC1~89
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/0ebc4d69b3211e47f0df60ebc43e1735d91286f8?hp=52a7b5f3f80a515983420bf9986f951186c931a5

Care with printability of logged information.  Bug 1609
---

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 58ca02dbe..9b7c59d62 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -2438,7 +2438,7 @@ if (++synprot_error_count > smtp_max_synprot_errors)
   yield = 1;
   log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
     "syntax or protocol errors (last command was \"%s\")",
-    host_and_ident(FALSE), smtp_cmd_buffer);
+    host_and_ident(FALSE), string_printing(smtp_cmd_buffer));
   }
 
 if (code > 0)
@@ -3397,7 +3397,7 @@ while (done <= 0)
         {
         log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
           "syntax or protocol errors (last command was \"%s\")",
-          host_and_ident(FALSE), smtp_cmd_buffer);
+          host_and_ident(FALSE), string_printing(smtp_cmd_buffer));
         done = 1;
         }
 
@@ -5015,7 +5015,7 @@ while (done <= 0)
       done = 2;
       log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
         "unrecognized commands (last was \"%s\")", host_and_ident(FALSE),
-        smtp_cmd_buffer);
+        string_printing(smtp_cmd_buffer));
       }
     else
       done = synprot_error(L_smtp_syntax_error, 500, NULL,