- src/smtp_in.c: applied upstream patch to fix buffer overflow; this is

[packages/exim.git] / exim-smtp_in.patch

--- exim-3.36.orig/src/smtp_in.c
+++ exim-3.36/src/smtp_in.c
@@ -2021,13 +2021,12 @@
 
     if (!check_helo(smtp_data))
       {
-      char *s;
-      smtp_printf("501 syntactically invalid %s argument(s)\r\n", hello);
-      if (*smtp_data == 0) strcpy(smtp_data, "(no argument given)");
-      s = string_printing(smtp_data);
+      smtp_printf("501 Syntactically invalid %s argument(s)\r\n", hello);
       log_write(0, LOG_MAIN|LOG_REJECT, "rejected %s from %s: syntactically "
         "invalid argument(s): %s", hello,
-        (sender_fullhost == NULL)? "local process" : sender_fullhost, s);
+        (sender_fullhost == NULL)? "local process" : sender_fullhost,
+        (*smtp_data == 0)? "(no argument given)" :
+                           string_printing(smtp_data));
       break;
       }